serf_handler 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00eea1fb24bfec8dfead8736d7cb23440912bf85
-  data.tar.gz: 0782038b311bda6e41a695ef20fd03ac053dec9b
+  metadata.gz: 27535af1c02822c2c7522fd82505733ae6ff791f
+  data.tar.gz: 19564f301e7b6a89c50e48844ebf26ab11db387b
 SHA512:
-  metadata.gz: 54ce860d1c4a1c108d661b56708dab420912cad330707593b66404cb2fb01e0bb9a9960071ae7f9e426ed19560756e28a1f5cd67d1af9e77e2f12cc16708085c
-  data.tar.gz: c080b5a54e9cc28aded5a503015f0de1ed5658c753707deaa5a9e0382f413960effcfda3bb7f673b9278c51535760539c4e513f8df0907f428916f03eebd68e4
+  metadata.gz: 4a65cf643dcf1ba871cfabebfecb284fb546345d7413d5333ea942920eac2e6db4a4eb3cef0360ffd2e4ffc0e6cc05616a11313df2c8367e67b95817964bd103
+  data.tar.gz: ee808177d262827a4a2d50315578bd5c99718c21cb0f66761551717b51e5e385591902b67b521e22823f7cf9c3fb25c1d7d9d282a6d5ea519c5a56c3bc7be55b

data/example/custom_query_handler.rb

@@ -5,7 +5,7 @@
 #  Control services
 #   serf query -tag role=web status iis
 #  Control system shutdown or reboot
-#   serf event system_ctl 'shutdown lb'
+#   serf query -node your_host shutdown
 
 require 'yaml'
 require 'serf_handler'
@@ -38,7 +38,7 @@ class CustomQueryHandler < SerfHandler
 
   def execute_command(command)
     result = `#{command}`
-    log "execute #{command} => result: #{$CHILD_STATUS}"
+    info "execute #{command} => result: #{$CHILD_STATUS}"
     result_response $CHILD_STATUS unless command.downcase.include?('status')
     status_response result if command.downcase.include?('status')
   end
@@ -48,6 +48,7 @@ class CustomQueryHandler < SerfHandler
       response('success')
     else
       response('fail')
+      error 'Failed to execute the command.'
     end
   end
 

data/lib/serf_handler.rb

@@ -9,6 +9,7 @@ class SerfHandler
 
   def initialize(log_file = nil)
     @logger = create_logger(log_file)
+    set_logging if @logger.is_a? Logger
     @logger.level = Logger::INFO
     @name = ENV['SERF_SELF_NAME']
     @role = ENV['SERF_TAG_ROLE'] || ENV['SERF_SELF_ROLE']
@@ -19,6 +20,13 @@ class SerfHandler
              end
   end
 
+  def set_logging
+    @logger.formatter = proc do |sv, datetime, _pn, msg|
+      "[#{datetime.strftime('%Y-%m-%d %H:%M:%S.%L')}][#{sv}] #{msg}\n"
+    end
+    @logger.level = Logger::INFO
+  end
+
   def create_logger(log_file)
     if log_file
       log_file.is_a?(String) ? Logger.new(log_file) : log_file
@@ -27,14 +35,23 @@ class SerfHandler
     end
   end
 
-  def log(msg)
+  def info(msg)
     @logger.info(msg)
   end
+  alias_method :log, :info
+
+  def warn(msg)
+    @logger.warn(msg)
+  end
+
+  def error(msg)
+    @logger.error(msg)
+  end
 
   def response(msg)
     if msg.bytesize > 1024
       message = 'message exceeds limit of 1024 bytes.'
-      log message
+      warn message
       puts message
     else
       puts msg
@@ -68,10 +85,10 @@ class SerfHandlerProxy < SerfHandler
       begin
         the_handler.send @event
       rescue NoMethodError
-        log "#{@event} event not implemented by class"
+        warn "#{@event} event not implemented by class"
       end
     else
-      log 'no handler for role'
+      info 'no handler for role'
     end
   end
 end

data/serf_handler.gemspec

@@ -5,7 +5,7 @@ require 'serf_handler'
 
 Gem::Specification.new do |gem|
   gem.name        = 'serf_handler'
-  gem.version     = '0.2.1'
+  gem.version     = '0.2.2'
   gem.authors     = ['KONNO Katsuyuki']
   gem.email       = 'konno.katsuyuki@nifty.com'
   gem.description = 'Serf event handler for ruby'

data/spec/serf_handler_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'logger'
 
 describe 'SerfHandler' do
-  context 'Check initialize process' do
+  context 'Check initialize process & error method' do
     before do
       ENV['SERF_SELF_NAME'] = 'local'
       ENV['SERF_SELF_ROLE'] = 'web'
@@ -23,6 +23,22 @@ describe 'SerfHandler' do
       handler = SerfHandler.new
       expect(handler.event).to eq('member_join')
     end
+
+    it 'write error' do
+      logger = double('Logger')
+      expect(logger).to receive(:level=).with(Logger::INFO)
+      expect(logger).to receive(:error).with('Error occurred').and_return(true)
+      handler = SerfHandler.new(logger)
+      expect(handler.error('Error occurred')).to be true
+    end
+
+    it 'alias_method' do
+      logger = double('Logger')
+      expect(logger).to receive(:level=).with(Logger::INFO)
+      expect(logger).to receive(:info).with('alias method test').and_return(true)
+      handler = SerfHandler.new(logger)
+      expect(handler.log('alias method test')).to be true
+    end
   end
 
   context 'Check user event processing' do
@@ -73,7 +89,7 @@ describe 'SerfHandlerProxy' do
     it 'has no method implemented' do
       logger = double('Logger')
       expect(logger).to receive(:level=).with(Logger::INFO)
-      expect(logger).to receive(:info).with('member_join event not implemented by class').and_return(true)
+      expect(logger).to receive(:warn).with('member_join event not implemented by class').and_return(true)
       handler = SerfHandlerProxy.new(logger)
       handler.register('default', SerfHandler.new)
       expect(handler.run).to be true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serf_handler
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - KONNO Katsuyuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger