v0.4.16 - hangup

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.16
+
+* hangup - disable distant signal traps/ignores
+
 # 0.4.15
 
 * collectors/iostat - compat for older (v9.x) sysstat

bin/panoptimon

@@ -108,7 +108,16 @@ if opts.daemonize
   # but this has support for redirecting io to logfiles... worth it?
   Daemons.daemonize(
     app_name: Pathname.new($0).basename.to_s,
-    log_output: true)
+    log_output: true,
+  )
+
+  # TODO fancier method of reloading config?  Note that we only need to
+  # trap HUP when using daemonize (which ignores it before forking.)
+  # NOTE said fancy method would require major refactor of this file.
+  trap('HUP') {
+    monitor.logger.warn 'Hangup...'
+    monitor.stop
+  }
 end
 
 # TODO maybe split config loading / init across daemonize for better
@@ -120,4 +129,6 @@ EM.run {
   monitor.run
 }
 
+monitor.logger.warn 'Bye.'
+
 # vim:ts=2:sw=2:et:sta

lib/panoptimon/http.rb

@@ -11,7 +11,7 @@ def initialize (args={})
     @match = []
     @mount = []
     # TODO args[:config].http_port, ssl, etc
-    @http = Thin::Server.new('0.0.0.0', 8080, self);
+    @http = Thin::Server.new('0.0.0.0', 8080, self, signals: false);
   end
 
   def start

lib/panoptimon/version.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2012-2013 Sourcefire, Inc.
 
 module Panoptimon
-  VERSION = "0.4.15"
+  VERSION = "0.4.16"
 end