null+****@clear*****
null+****@clear*****
2010年 7月 16日 (金) 20:20:15 JST
Kouhei Sutou 2010-07-16 11:20:15 +0000 (Fri, 16 Jul 2010)
New Revision: 21e02f887194b7e8c3d4f1db049938f0049646b8
Log:
follow returned JSON format change.
Modified files:
data/munin/groonga_disk
data/munin/groonga_n_records
data/munin/groonga_status
Modified: data/munin/groonga_disk (+7 -1)
===================================================================
--- data/munin/groonga_disk 2010-07-16 02:09:57 +0000 (c599c6c)
+++ data/munin/groonga_disk 2010-07-16 11:20:15 +0000 (745bac7)
@@ -17,7 +17,13 @@ command = ARGV.shift
def parse(success, result)
if success
begin
- [success, JSON.parse(result)]
+ status, body = JSON.parse(result)
+ return_code, start_time, elapsed, error_message = status
+ if return_code.zero?
+ [success, body]
+ else
+ [false, error_message]
+ end
rescue JSON::ParserError
[false, $!.message]
end
Modified: data/munin/groonga_n_records (+7 -1)
===================================================================
--- data/munin/groonga_n_records 2010-07-16 02:09:57 +0000 (e93e6e8)
+++ data/munin/groonga_n_records 2010-07-16 11:20:15 +0000 (c99851b)
@@ -17,7 +17,13 @@ command = ARGV.shift
def parse(success, result)
if success
begin
- [success, JSON.parse(result)]
+ status, body = JSON.parse(result)
+ return_code, start_time, elapsed, error_message = status
+ if return_code.zero?
+ [success, body]
+ else
+ [false, error_message]
+ end
rescue JSON::ParserError
[false, $!.message]
end
Modified: data/munin/groonga_status (+7 -1)
===================================================================
--- data/munin/groonga_status 2010-07-16 02:09:57 +0000 (1f984cd)
+++ data/munin/groonga_status 2010-07-16 11:20:15 +0000 (3f127df)
@@ -15,7 +15,13 @@ command = ARGV.shift
def parse(success, result)
if success
begin
- [success, JSON.parse(result)]
+ status, body = JSON.parse(result)
+ return_code, start_time, elapsed, error_message = status
+ if return_code.zero?
+ [success, body]
+ else
+ [false, error_message]
+ end
rescue JSON::ParserError
[false, $!.message]
end