summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorSaku Ytti <saku@ytti.fi>2014-02-23 19:11:29 +0200
committerSaku Ytti <saku@ytti.fi>2014-02-23 19:11:29 +0200
commit8880188001da23a5f0960e3970c4eb9bbd448306 (patch)
tree41a1f79450ff1683a2d5aa1f024a564e84230e25 /bin
parent06e5f68db6cfcbd80295874db1f00a25e8ba1229 (diff)
Migrate to sinatra/puma from webrick
As I can't do IO#select on sinatra/puma to run it when I have time, I have to run it on separate thread. This means Nodes container needs to be thread safe, it now has ghetto mutex locking, but I probably need to be be more focused what are the external methods that can be called and wrap those in @mutex.synchronize Provide also HTML UI not just JSON for ghetto UI to people who don't want to integrate
Diffstat (limited to 'bin')
-rwxr-xr-xbin/oxidized2
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/oxidized b/bin/oxidized
index 2509279..72db61a 100755
--- a/bin/oxidized
+++ b/bin/oxidized
@@ -2,6 +2,8 @@
require 'oxidized'
+trap("INT") { exit } # sinatra will otherwise steak this from us
+
begin
Process.daemon unless $DEBUG
Oxidized.new