From 8880188001da23a5f0960e3970c4eb9bbd448306 Mon Sep 17 00:00:00 2001 From: Saku Ytti 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 --- lib/oxidized/manager.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/oxidized/manager.rb') diff --git a/lib/oxidized/manager.rb b/lib/oxidized/manager.rb index 8c53d64..5065617 100644 --- a/lib/oxidized/manager.rb +++ b/lib/oxidized/manager.rb @@ -34,7 +34,7 @@ module Oxidized def model= _model _model = Manager.load Config::ModelDir, _model return false if _model.empty? - @model.merge! _model + @model.merge! _model end def source= _source return nil if @source.key? _source -- cgit v1.2.1