summaryrefslogtreecommitdiff
path: root/lib/oxidized/api/rest.rb
diff options
context:
space:
mode:
authorSaku Ytti <saku@ytti.fi>2013-04-26 17:03:01 +0300
committerSaku Ytti <saku@ytti.fi>2013-04-26 17:03:01 +0300
commitb30ca8b31e23ea9f518c92e2ef51f85d8e7a0584 (patch)
tree3b93d10cd9b005a1457ec7a8dcc862baa19d05c7 /lib/oxidized/api/rest.rb
parentd4e251b42ff4f4831762912e2ad3d50b91e8afb0 (diff)
Fix: telnet exceptions, broken json/ext, typo
Kudos to Samer Abdel-Hafez for noticing
Diffstat (limited to 'lib/oxidized/api/rest.rb')
-rw-r--r--lib/oxidized/api/rest.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/oxidized/api/rest.rb b/lib/oxidized/api/rest.rb
index 9e00837..783b445 100644
--- a/lib/oxidized/api/rest.rb
+++ b/lib/oxidized/api/rest.rb
@@ -5,6 +5,7 @@ module Oxidized
class Rest
module Helpers
def send res, msg='OK', status=200
+ msg = {:result => msg}
res['Content-Type'] = 'application/json'
res.status = status
res.body = JSON.dump msg
@@ -15,7 +16,7 @@ module Oxidized
@nodes = nodes
addr, port = listen.to_s.split ':'
port, addr = addr, nil if not port
- @web = WEBrick::HTTPServer.new :BindAddress=>addr, :Port=>port, :Logger=>Log
+ @web = WEBrick::HTTPServer.new :BindAddress=>addr, :Port=>port, :Logger=>Log, :AccessLog=>[]
maps
end
def work