From 5748dc015db423e4469c4bfd43442ba6bea72160 Mon Sep 17 00:00:00 2001
From: nopedial <shafez@ike-2.local>
Date: Sat, 26 Oct 2013 02:14:31 +0200
Subject: add primitive plain ascii API output support
---
lib/oxidized/api/rest.rb | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
(limited to 'lib/oxidized/api')
diff --git a/lib/oxidized/api/rest.rb b/lib/oxidized/api/rest.rb
index d1bd7dc..9e7ebb8 100644
--- a/lib/oxidized/api/rest.rb
+++ b/lib/oxidized/api/rest.rb
@@ -5,10 +5,13 @@ 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
+ res.body = msg
+ if not res.body[-1] == '+'
+ msg = {:result => msg}
+ res['Content-Type'] = 'application/json'
+ res.status = status
+ res.body = JSON.dump msg
+ end
end
end
include Oxidized::API::Rest::Helpers
@@ -49,7 +52,12 @@ module Oxidized
else
group, node = 0, $1
end
- send res, @nodes.fetch(node, group)
+ if node.include? '.txt'
+ node.gsub! '.txt', ''
+ send res, [ @nodes.fetch(node, group) + '+' ].join(':') # add local switch to trick 'send' out of json formatting
+ else
+ send res, @nodes.fetch(node, group)
+ end
rescue Oxidized::NotSupported => e
send res, e
end
--
cgit v1.2.3