From 8880188001da23a5f0960e3970c4eb9bbd448306 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Sun, 23 Feb 2014 19:11:29 +0200
Subject: 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
---
 bin/oxidized | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bin/oxidized')

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
-- 
cgit v1.2.1