summaryrefslogtreecommitdiff
path: root/lib/oxidized/node.rb
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 /lib/oxidized/node.rb
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 'lib/oxidized/node.rb')
-rw-r--r--lib/oxidized/node.rb12
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb
index 05a926c..6c7b3aa 100644
--- a/lib/oxidized/node.rb
+++ b/lib/oxidized/node.rb
@@ -58,12 +58,14 @@ module Oxidized
def serialize
h = {
- :name => @name,
- :ip => @ip,
- :group => @group,
- :model => @model.class.to_s,
- :last => nil,
+ :name => @name,
+ :full_name => @name,
+ :ip => @ip,
+ :group => @group,
+ :model => @model.class.to_s,
+ :last => nil,
}
+ h[:full_name] = [@group, @name].join('/') if @group
if @last
h[:last] = {
:start => @last.start,