[Groonga-commit] groonga/groonga [master] [munin] support JSON library installed by RubyGems.

Back to archive index

null+****@clear***** null+****@clear*****
2012年 6月 22日 (金) 09:29:34 JST


IWAI, Masaharu	2012-06-22 09:29:34 +0900 (Fri, 22 Jun 2012)

  New Revision: 44e90962bf9199e78d737d0511469b3996bd56a2
  https://github.com/groonga/groonga/commit/44e90962bf9199e78d737d0511469b3996bd56a2

  Merged 719ac9a: Merge pull request #17 from iwaim/master

  Log:
    [munin] support JSON library installed by RubyGems.

  Modified files:
    data/munin/groonga_disk
    data/munin/groonga_n_records

  Modified: data/munin/groonga_disk (+5 -0)
===================================================================
--- data/munin/groonga_disk    2012-06-21 19:28:30 +0900 (e1248f0)
+++ data/munin/groonga_disk    2012-06-22 09:29:34 +0900 (ecc1073)
@@ -4,7 +4,12 @@
 #%# capabilities=autoconf
 
 require 'shellwords'
+begin
 require 'json'
+rescue LoadError
+  require 'rubygems'
+  require 'json'
+end
 require 'English'
 
 label = ENV["label"]

  Modified: data/munin/groonga_n_records (+5 -0)
===================================================================
--- data/munin/groonga_n_records    2012-06-21 19:28:30 +0900 (c99851b)
+++ data/munin/groonga_n_records    2012-06-22 09:29:34 +0900 (d097cf6)
@@ -4,7 +4,12 @@
 #%# capabilities=autoconf
 
 require 'shellwords'
+begin
 require 'json'
+rescue LoadError
+  require 'rubygems'
+  require 'json'
+end
 
 label = ENV["label"]
 @groonga = ENV["groonga"] || "groonga"
-------------- next part --------------
HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...
Download 



Groonga-commit メーリングリストの案内
Back to archive index