murakumo 0.1.8 → 0.1.9

data/etc/murakumo.server

@@ -38,6 +38,9 @@ save)
 
   rm -f ${conf}.new
   ;;
+configtest)
+  $ctlprog -t $conf
+  ;;
 configure)
   if [ -e "$conf" ]; then
     echo "configuration file already exists."
@@ -108,6 +111,6 @@ hup)
   fi
   ;;
 *)
-  echo $"Usage: $0 {start|stop|restart|status|save|configure|hup}"
+  echo $"Usage: $0 {start|stop|restart|status|save|configtest|configure|hup}"
   exit 1
 esac

data/lib/cli/mrkmctl.rb

@@ -2,6 +2,7 @@ require 'drb/drb'
 require 'yaml'
 
 require 'cli/mrkmctl_options'
+require 'cli/murakumo_options'
 require 'misc/murakumo_const'
 
 # オプションをパース
@@ -88,6 +89,14 @@ IP address       TTL     Priority  Activity  Hostname
     n = there.clear_dead_list
     puts "#{n} nodes were deleted"
 
+  # 設定のテスト
+  when :configtest
+    conf = arg.kind_of?(String) ? arg : '/etc/murakumo.yml' 
+    ARGV.clear
+    ARGV.concat(['-c', conf])
+    murakumo_parse_args
+    puts 'Syntax OK'
+
   # 設定の出力
   when :yaml
     puts there.to_hash.to_yaml

data/lib/cli/mrkmctl_options.rb

@@ -66,6 +66,9 @@ def mrkmctl_parse_args
     desc 'clears a dead list'
     option :clear_dead_list, '-c', '--clear-dead-list'
 
+    desc 'tests a configuration file'
+    option :configtest, '-t', '--configtest [PATH]'
+
     desc 'outputs a configuration as yaml'
     option :yaml, '-y', '--yaml'
 
@@ -113,11 +116,11 @@ def mrkmctl_parse_args
       end
 
       # command
-      commands = [:list, :add, :delete, :add_node, :delete_node, :get, :set, :clear_dead_list, :yaml].map {|k|
+      commands = [:list, :add, :delete, :add_node, :delete_node, :get, :set, :clear_dead_list, :configtest, :yaml].map {|k|
         [k, options[k]]
       }.select {|i| not i[1].nil? }
 
-      opt_keys = %w(-L -A -D --add-node --delete-node --get --set --clear-dead-list --yaml)
+      opt_keys = %w(-L -A -D --add-node --delete-node --get --set --clear-dead-list --configtest --yaml)
 
       if commands.length < 1
         parse_error('command is not specified', *opt_keys)

data/lib/cli/murakumo_options.rb

@@ -5,7 +5,9 @@ require 'socket'
 
 require 'misc/murakumo_const'
 
-Version = Murakumo::VERSION
+unless defined?(Version)
+  Version = Murakumo::VERSION
+end
 
 def murakumo_parse_args
   optopus do
@@ -180,6 +182,13 @@ def murakumo_parse_args
       if hostnames.length != hostnames.uniq.length
         raise OptionParser::ParseError, 'same hostname was found'
       end
+
+      # health check
+      if options.config_file and (health_check = options.config_file['health-check'])
+        unless health_check.kind_of?(Hash) and health_check.all? {|k, v| v.has_key?('script') }
+          raise OptionParser::ParseError, 'configuration of a health check is not right'
+        end
+      end
     end
 
     error do |e|

data/lib/misc/murakumo_const.rb

@@ -1,5 +1,5 @@
 module Murakumo
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 
   # Priority
   MASTER = 1

data/lib/srv/murakumo_health_checker.rb

@@ -101,6 +101,10 @@ module Murakumo
               }
             rescue Timeout::Error
               retval = false
+            rescue => e
+              retval = false
+              message = (["#{e.class}: #{e.message}"] + (e.backtrace || [])).join("\n\tfrom ")
+              @logger.error("healthcheck failed: #{@name}: #{message}")
             end
 
             status = retval == true ? 'good' : retval == false ? 'bad' : '-'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murakumo
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - winebarrel