kanamei-keystone 0.0.14 → 0.0.15

data/example/batch_sample.rb

@@ -1,22 +1,23 @@
 require 'rubygems'
 require 'keystone'
+require "optparse"
 
 include Keystone::Batch::Base
 
-if ARGV[0] == nil
-  puts "set mail addr"
-  exit
-end
+# 実行時に--helpでオプション一覧
 
-# ERROR_MAIL_TOを設定しておけば自動でエラーメールが送信される
-ERROR_MAIL_TO = ARGV[0]
-# ●定数
-# ERROR_MAIL_TO （エラーメール送信先） 設定しておけば自動でエラーメールを送信してくれる
-# ERROR_MAIL_FROM （エラーメール送信元） 設定されてない場合はERROR_MAIL_TOを使用
-# ERROR_MAIL_STMP_ADDR （エラーメール送信SMTPアドレス） 設定されてない場合は"127.0.0.1"
-# ERROR_MAIL_STMP_PORT （エラーメール送信SMTPポート） 設定されてない場合は25
+has_option = {}
+opts = option_parser
+opts.on("-v value") do |v|
+  has_option[:v] = v
+end
+opts.on("-w who") do |v|
+  has_option[:w] = v
+end
 
 execute() do
   info "batch process01"
+  info "who=#{has_option[:w]}"
+  sleep 4
   raise 'error occur'
 end

data/lib/keystone.rb

@@ -11,7 +11,7 @@ autoload :Moji          , 'moji'
 
 module Keystone
 
-  VERSION = '0.0.14'
+  VERSION = '0.0.15'
 
   autoload :StringUtil , 'keystone/string_util'
   autoload :Batch      , 'keystone/batch'

data/lib/keystone/batch/base.rb

@@ -1,5 +1,6 @@
 
 require 'digest/md5'
+require "optparse"
 
 module Keystone::Batch
   #
@@ -18,12 +19,18 @@ module Keystone::Batch
   # ERROR_MAIL_STMP_PORT （エラーメール送信SMTPポート） 設定されてない場合は25
   #
   module Base
-    # [double_process_check]
-    #   2重起動チェック
-    # [auto_recover]
-    #   2重起動チェック用のpidファイルがすでに存在しているがプロセスは見あたらない
-    #   そんな時、そのまま実行を続けるかどうか
-    #
+    def option_parser
+      @options ||= OptionParser.new
+    end
+    
+    # [options]
+    #   プログラムより指定するバッチ動作オプション（ハッシュ値）
+    #   :error_mail_to
+    #   :error_mail_from
+    #   :error_mail_smtp_addr
+    #   :error_mail_smtp_port
+    #   :double_process_check
+    #   :auto_recover
     #
     # バッチの主処理をこのメソッドへのブロック引数として定義してください
     #
@@ -32,21 +39,51 @@ module Keystone::Batch
     #
     #   include Keystone::Batch::Base
     #
-    #   # ERROR_MAIL_TOを設定しておけば自動でエラーメールが送信される
-    #   ERROR_MAIL_TO = ARGV[0]
-    #
     #   execute() do
     #     info "batch process01"
     #   end
     #
-    def execute(double_process_check = true,auto_recover = true,&process)
+    def execute(options={},&process)
+      options[:error_mail_to] = nil unless options.key?(:error_mail_to)
+      options[:error_mail_from] = nil unless options.key?(:error_mail_from)
+      options[:error_mail_smtp_addr] = "127.0.0.1" unless options.key?(:error_mail_smtp_addr)
+      options[:error_mail_smtp_port] = 25 unless options.key?(:error_mail_smtp_port)
+      options[:double_process_check] = true unless options.key?(:double_process_check)
+      options[:auto_recover] = true unless options.key?(:auto_recover)
+
+      double_process_check = options[:double_process_check]
+      auto_recover         = options[:auto_recover]
+      
       debug "caller=#{caller}"
       pg_path = if File.expand_path(caller[0]) =~ /(.*):\d*\z/
         $1
+      else
+        raise "must not happen!! can not get caller value"
+      end
+      pid_file = nil
+      opts = option_parser()
+      opts.on("--lockfile LOCK_FILE_PATH") do |v|
+        double_process_check = true unless double_process_check
+        pid_file = v 
+      end
+
+      opts.on("--error_mail_to ADDRESS") do |v|
+        options[:error_mail_to] = v
       end
       
+      opts.on("--error_mail_from ADDREDD") do |v|
+        options[:error_mail_from] = v
+      end
+      opts.on("--error_mail_smtp_addr ADDRESS") do |v|
+        options[:error_mail_smtp_addr] = v
+      end
+      opts.on("--error_mail_smtp_port PORT") do |v|
+        options[:error_mail_smtp_port] = Integer(v)
+      end
+      
+      opts.parse!(ARGV)
+      
       info "start script(#{pg_path})"
-      warn "ERROR_MAIL_TO not defined.if you want error mail automatically,set this value." unless Module.constants.include?("ERROR_MAIL_TO")
       script_started_at = Time.now
       double_process_check_worked = false
       begin
@@ -55,21 +92,21 @@ module Keystone::Batch
           #pg_path = File.expand_path($0)
           pg_name = File.basename(pg_path)
           hash = Digest::MD5.hexdigest(pg_path)
-          pid_file = "/tmp/.#{pg_name}.#{hash}.pid"
+          pid_file = "/tmp/.#{pg_name}.#{hash}.pid" unless pid_file
           debug pid_file
           if File.exists?(pid_file)
             pid = File.open(pid_file).read.chomp
             pid_list = `ps -e | awk '{print $1}'`
-            if pid_list =~ /#{pid}/
+            if (pid != nil && pid != "" ) && pid_list =~ /#{pid}/
               warn "pid:#{pid} still running"
               double_process_check_worked = true
               return nil
             else
               if auto_recover
-                warn "pid file still exists,but process does not found.so process continues"
+                warn "lock file still exists[pid=#{pid}],but process does not found.auto_recover enabled.so process continues"
               else
                 double_process_check_worked = true
-                raise "pid file still exists,but process does not found"
+                raise "lock file still exists[pid=#{pid}],but process does not found.auto_recover disabled.so process can not continue"
               end
             end
           end
@@ -80,7 +117,7 @@ module Keystone::Batch
         return (yield process)
       rescue => e
         error e
-        send_error_mail(e)
+        send_error_mail(e,options)
       ensure
         unless double_process_check_worked
           File.delete(pid_file) if double_process_check
@@ -97,16 +134,21 @@ module Keystone::Batch
     # [exception]
     #   エクセプションクラスインスタンス
     #
-    def send_error_mail(exception)
-      if Module.constants.include?("ERROR_MAIL_TO")
+    def send_error_mail(exception,options)
+      if options[:error_mail_to]
         host = Keystone::Os.get()
         title = %|error occur at "#{host.hostname}" [#{exception.message}]|
         
-        mail_to = ERROR_MAIL_TO
+        mail_to = options[:error_mail_to]
         mail_to = [mail_to] if mail_to.is_a?(String)
-        mail_from = Module.constants.include?("ERROR_MAIL_FROM") ?  ERROR_MAIL_FROM : mail_to[0]
-        smtp_addr = Module.constants.include?("ERROR_MAIL_STMP_ADDR") ?  ERROR_MAIL_STMP_ADDR : '127.0.0.1'
-        smtp_port = Module.constants.include?("ERROR_MAIL_STMP_PORT") ?  ERROR_MAIL_STMP_PORT : 25
+        mail_from = options[:error_mail_from] ?  options[:error_mail_from] : mail_to[0]
+        smtp_addr = options[:error_mail_smtp_addr]
+        smtp_port = options[:error_mail_smtp_port]
+        
+        debug "mail_to=#{mail_to}"
+        debug "mail_from=#{mail_from}"
+        debug "smtp_addr=#{smtp_addr}"
+        debug "smtp_port=#{smtp_port}"
         
         body  = <<-BODY
 ==== error message ====
@@ -117,6 +159,8 @@ module Keystone::Batch
 #{host.dump}
 BODY
         Keystone::Mail::Send.send(mail_from,mail_to,title,body,smtp_addr,smtp_port)
+      else
+        warn "ERROR_MAIL_TO not defined.if you want error mail automatically,set this value."
       end
     end
   end

data/lib/keystone/core_ext/object.rb

@@ -22,6 +22,7 @@ class Object
   end
   
   # 1.8.7  エミュレート
+  # TODO version 指定
   def tap
     yield(self)
     self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kanamei-keystone
 version: !ruby/object:Gem::Version 
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors: 
 - kanamei