rbatch 1.7.0 → 1.8.0

data/lib/rbatch/cmd.rb

@@ -30,7 +30,8 @@ module RBatch
   #
   class Cmd
     @@def_opt = {
-      :raise     => false
+      :raise     => false,
+      :timeout   => 0
     }
     @cmd_str
     @opt
@@ -41,6 +42,7 @@ module RBatch
     # +cmd_str+ = Command string. Such ad "ls -l"
     # +opt+ = Option hash object. Hash keys is follows.
     # - +:raise+ (Boolean) = If command exit status is not 0, raise exception. Default is false.
+    # - +:timeout+ (Integer) = If command timeout , raise exception. Default is 0 sec ( 0 means disable) .
     def initialize(cmd_str,opt = nil)
       raise(CmdException,"Command string is nil") if cmd_str.nil?
       @cmd_str = cmd_str
@@ -68,7 +70,17 @@ module RBatch
       stdout_file = Tempfile::new("rbatch_tmpout",RBatch::tmp_dir)
       stderr_file = Tempfile::new("rbatch_tmperr",RBatch::tmp_dir)
       pid = spawn(@cmd_str,:out => [stdout_file,"w"],:err => [stderr_file,"w"])
-      status =  Process.waitpid2(pid)[1] >> 8
+      if @opt[:timeout] != 0
+        timeout(@opt[:timeout]) do
+          begin
+            status =  Process.waitpid2(pid)[1] >> 8
+          rescue Timeout::Error => e
+            raise(CmdException,"Command timeout (over " + @opt[:timeout] + " sec)" )
+          end
+        end
+      else
+        status =  Process.waitpid2(pid)[1] >> 8
+      end
       result = RBatch::CmdResult.new(stdout_file,stderr_file,status,@cmd_str)
       if @opt[:raise] && status != 0
         raise(CmdException,"Command exit status is not 0. result: " + result.to_s)

data/lib/rbatch/log.rb

@@ -1,6 +1,7 @@
 require 'logger'
 require 'fileutils'
 require 'pathname'
+require 'net/smtp'
 
 module RBatch
   #=== About RBatch::Log
@@ -26,15 +27,14 @@ module RBatch
   #
   #logfile : ./log/20121020_005953_sample1.log
   #
-  # # Logfile created on 2012-10-20 00:59:53 +0900 by logger.rb/25413
-  # I, [2012-10-20T00:59:53.895528 #3208]  INFO -- : info string
-  # E, [2012-10-20T00:59:53.895582 #3208] ERROR -- : error string
-  # F, [2012-10-20T00:59:53.895629 #3208] FATAL -- : Caught exception; existing 1
-  # F, [2012-10-20T00:59:53.895667 #3208] FATAL -- : exception (RuntimeError)
-  # test.rb:6:in `block in <main>'
-  # /usr/local/lib/ruby192/lib/ruby/gems/1.9.1/gems/rbatch-1.0.0/lib/rbatch/auto_logger.rb:37:in `initialize'
-  # test.rb:3:in `new'
-  # test.rb:3:in `<main>'
+  # [2012-10-20 00:59:53 +900] [INFO ] info string
+  # [2012-10-20 00:59:53 +900] [ERROR] error string
+  # [2012-10-20 00:59:53 +900] [FATAL] Caught exception; existing 1
+  # [2012-10-20 00:59:53 +900] [FATAL] exception (RuntimeError)
+  #     [backtrace] test.rb:6:in `block in <main>'
+  #     [backtrace] /usr/local/lib/ruby192/lib/ruby/gems/1.9.1/gems/rbatch-1.0.0/lib/rbatch/auto_logger.rb:37:in `initialize'
+  #     [backtrace] test.rb:3:in `new'
+  #     [backtrace] test.rb:3:in `<main>'
   #
   class Log
     @@verbose = false
@@ -46,7 +46,12 @@ module RBatch
       :stdout    => false,
       :quiet     => false,
       :delete_old_log => false,
-      :delete_old_log_date => 7
+      :delete_old_log_date => 7,
+      :send_mail => false,
+      :mail_to   => nil,
+      :mail_from => "rbatch.localhost",
+      :mail_server_host => "localhost",
+      :mail_server_port => 25
     }
     @@log_level_map = {
       "debug" => Logger::DEBUG,
@@ -162,11 +167,13 @@ module RBatch
     def fatal(a)
       @stdout_log.fatal(a) if @opt[:stdout]
       @log.fatal(a)
+      send_mail(a) if @opt[:send_mail]
     end
 
     def error(a)
       @stdout_log.error(a) if @opt[:stdout]
       @log.error(a)
+      send_mail(a) if @opt[:send_mail]
     end
 
     def warn(a)
@@ -210,6 +217,26 @@ module RBatch
         end
       end
     end
+
+    private
+
+    # send mail
+    def send_mail(msg)
+      body = <<EOT
+From: <#{@opt[:mail_from]}>
+To: <#{@opt[:mail_to]}>
+Subject: [RBatch] #{RBatch.program_name} has error
+Date: #{Time::now.strftime("%a, %d %b %Y %X %z")}
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-2022-JP
+Content-Transfer-Encoding: 7bit
+
+#{msg}
+EOT
+      Net::SMTP.start(@opt[:mail_server_host],@opt[:mail_server_port] ) {|smtp|
+        smtp.send_mail(body,@opt[:mail_from],@opt[:mail_to])
+      }
+    end
   end # end class
 end # end module
 

data/lib/rbatch.rb

@@ -1,5 +1,5 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
-
+require 'digest'
 module RBatch
   @@program_name = $PROGRAM_NAME
   module_function
@@ -31,21 +31,31 @@ module RBatch
       return nil
     end
   end
+  def double_run_check
+    # double run check
+    if ( RBatch::common_config != nil && RBatch::common_config["forbid_double_run"] )
+      lock_file="rbatch_lock_" + Digest::MD5.hexdigest(@@program_name)
+      if Dir.exists? RBatch::tmp_dir
+        Dir::foreach(RBatch::tmp_dir) do |f|
+          if (Regexp.new(lock_file) =~ f)
+            raise RBatchException, "Script double run is forbid about \"#{RBatch::program_name}\""
+          end
+        end
+      end
+      # make lockfile
+      Tempfile::new(lock_file,RBatch::tmp_dir)
+    end
+  end
+
+  def double_run_lock_file ;  ; end
 end
 
+# RBatch Exception
+class RBatchException < Exception ; end
+
+# main
 require 'rbatch/log'
 require 'rbatch/config'
 require 'rbatch/cmd'
 
-# double run check
-if ( RBatch::common_config != nil && RBatch::common_config["forbid_double_run"] )
-  if Dir.exists? RBatch::tmp_dir
-    Dir::foreach(RBatch::tmp_dir) do |f|
-      if (/rbatch_lock/ =~ f)
-        raise "Can not start RBatch. RBatch lock file exists (#{RBatch::tmp_dir}#{f})."
-      end
-    end
-  end
-  # make lockfile
-  Tempfile::new("rbatch_lock",RBatch::tmp_dir)
-end
+RBatch::double_run_check

data/sample/bin/test.rb

@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+require 'rbatch'
+
+RBatch::Log.new() do |log|
+sdfa
+end

data/sample/bin/test2.rb

@@ -0,0 +1,3 @@
+require 'rbatch'
+
+sleep 100

data/sample/log/20130131_apache_log_insert.log

@@ -0,0 +1,23 @@
+[2013-01-31 00:50:01 +0900] [INFO ] Start Logging. (PID=24915)
+[2013-01-31 00:50:01 +0900] [INFO ] Start -----------------
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 06:15:40','test.user1','192.168.1.111','server1','GET /test/sample.html HTTP/1.1',4,200,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','http://www.hoge.develop.jp:8080/amserver/UI/Login?goto=http://www.hoge.develop.jp/test/sample.html')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 06:15:50','test.user1','192.168.1.111','server1','GET /test/sample.html HTTP/1.1',0,200,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','http://www.hoge.develop.jp:8080/amserver/UI/Login?goto=http://www.hoge.develop.jp/test/sample.html')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 06:15:59','test.user1','192.168.1.111','server1','GET /test/sample.html HTTP/1.1',0,200,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','http://www.hoge.develop.jp:8080/amserver/UI/Login?goto=http://www.hoge.develop.jp/test/sample.html')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 06:15:59','test.user1','192.168.1.111','server1','GET /test/sample.html HTTP/1.1',0,200,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','http://www.hoge.develop.jp:8080/amserver/UI/Login?goto=http://www.hoge.develop.jp/test/sample.html')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 06:16:00','test.user1','192.168.1.111','server1','GET /test/sample.html HTTP/1.1',0,200,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','http://www.hoge.develop.jp:8080/amserver/UI/Login?goto=http://www.hoge.develop.jp/test/sample.html')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 06:16:00','test.user1','192.168.1.111','server1','GET /test/sample.html HTTP/1.1',0,200,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','http://www.hoge.develop.jp:8080/amserver/UI/Login?goto=http://www.hoge.develop.jp/test/sample.html')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 06:16:00','test.user1','192.168.1.111','server1','GET /test/sample.html HTTP/1.1',0,200,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','http://www.hoge.develop.jp:8080/amserver/UI/Login?goto=http://www.hoge.develop.jp/test/sample.html')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 06:16:04','test.user1','-','server1','GET / HTTP/1.1',0,200,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','-')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 06:22:22','test.user1','-','server1','GET / HTTP/1.1',1,200,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','-')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 06:23:11','test.user1','-','server1','GET /test/sample.html HTTP/1.1',0,304,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','-')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 06:23:33','test.user1','192.168.1.116','server1','GET /test/sample.html HTTP/1.1',0,304,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','-')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 06:24:48','amadmin','-','server1','GET /test/sample.html HTTP/1.1',0,304,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','http://www.hoge.develop.jp:8080/amserver/UI/Login?goto=http%3A%2F%2Fwww.hoge.develop.jp%2Ftest%2Fsample.html&gx_charset=UTF-8')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 06:25:41','amadmin','-','server1','GET / HTTP/1.1',0,200,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','-')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 22:20:19','-','-','server1','GET / HTTP/1.1',0,403,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','-')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 22:20:19','-','-','server1','GET /favicon.ico HTTP/1.1',0,403,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','-')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 22:23:25','test.user1@example.com','-','server1','GET / HTTP/1.1',0,200,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','-')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 22:24:11','test.user1@example.com','-','server1','GET / HTTP/1.1',0,200,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','-')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 22:24:51','test.user1@example.com','-','server1','GET /test/cmx_test01.html HTTP/1.1',0,404,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','-')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 22:24:52','test.user1@example.com','-','server1','GET /barerrors/js/chgCss.js HTTP/1.1',0,200,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','http://www.hoge.develop.jp/test/cmx_test01.html')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 22:24:52','test.user1@example.com','-','server1','GET /barerrors/images/logo.gif HTTP/1.1',0,200,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','http://www.hoge.develop.jp/test/cmx_test01.html')
+[2013-01-31 00:50:02 +0900] [INFO ] exec sql: INSERT INTO access_log (companyId,date,login_id,access_ip,host_name,access_url,forward_time,httpstatus,user_agent,referer) VALUES ('sample.co','2012/07/10 22:24:52','test.user1@example.com','-','server1','GET /barerrors/images/nri_logo.gif HTTP/1.1',0,200,'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28','http://www.hoge.develop.jp/test/cmx_test01.html')

data/sample/log/20130209_test.log

@@ -0,0 +1,128 @@
+[2013-02-09 23:45:26 +0900] [INFO ] Start Logging. (PID=4534)
+[2013-02-09 23:45:26 +0900] [ERROR] hoge
+[2013-02-09 23:45:26 +0900] [FATAL] uninitialized constant RBatch::Log::Mail
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:225:in `send_mail'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:177:in `error'
+    [backtrace] sample/bin/test.rb:4:in `block in <main>'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:157:in `initialize'
+    [backtrace] sample/bin/test.rb:3:in `new'
+    [backtrace] sample/bin/test.rb:3:in `<main>'
+[2013-02-09 23:45:29 +0900] [INFO ] Start Logging. (PID=4559)
+[2013-02-09 23:45:29 +0900] [ERROR] hoge
+[2013-02-09 23:45:29 +0900] [FATAL] uninitialized constant RBatch::Log::Mail
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:225:in `send_mail'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:177:in `error'
+    [backtrace] sample/bin/test.rb:4:in `block in <main>'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:157:in `initialize'
+    [backtrace] sample/bin/test.rb:3:in `new'
+    [backtrace] sample/bin/test.rb:3:in `<main>'
+[2013-02-09 23:49:58 +0900] [INFO ] Start Logging. (PID=6930)
+[2013-02-09 23:49:58 +0900] [ERROR] hoge
+[2013-02-09 23:49:58 +0900] [FATAL] Connection refused - connect(2)
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `initialize'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `open'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `tcp_socket'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:555:in `block in do_start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/timeout.rb:58:in `timeout'
+    [backtrace] /usr/local/lib/ruby/1.9.1/timeout.rb:89:in `timeout'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:555:in `do_start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:525:in `start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:463:in `start'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:236:in `send_mail'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:177:in `error'
+    [backtrace] sample/bin/test.rb:4:in `block in <main>'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:157:in `initialize'
+    [backtrace] sample/bin/test.rb:3:in `new'
+    [backtrace] sample/bin/test.rb:3:in `<main>'
+[2013-02-09 23:50:50 +0900] [INFO ] Start Logging. (PID=7387)
+[2013-02-09 23:50:50 +0900] [ERROR] hoge
+[2013-02-09 23:50:50 +0900] [FATAL] Connection refused - connect(2)
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `initialize'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `open'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `tcp_socket'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:555:in `block in do_start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/timeout.rb:58:in `timeout'
+    [backtrace] /usr/local/lib/ruby/1.9.1/timeout.rb:89:in `timeout'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:555:in `do_start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:525:in `start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:463:in `start'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:236:in `send_mail'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:177:in `error'
+    [backtrace] sample/bin/test.rb:4:in `block in <main>'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:157:in `initialize'
+    [backtrace] sample/bin/test.rb:3:in `new'
+    [backtrace] sample/bin/test.rb:3:in `<main>'
+[2013-02-09 23:51:56 +0900] [INFO ] Start Logging. (PID=7985)
+[2013-02-09 23:51:56 +0900] [ERROR] hoge
+[2013-02-09 23:51:56 +0900] [FATAL] Connection refused - connect(2)
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `initialize'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `open'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `tcp_socket'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:555:in `block in do_start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/timeout.rb:58:in `timeout'
+    [backtrace] /usr/local/lib/ruby/1.9.1/timeout.rb:89:in `timeout'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:555:in `do_start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:525:in `start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:463:in `start'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:236:in `send_mail'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:177:in `error'
+    [backtrace] sample/bin/test.rb:4:in `block in <main>'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:157:in `initialize'
+    [backtrace] sample/bin/test.rb:3:in `new'
+    [backtrace] sample/bin/test.rb:3:in `<main>'
+[2013-02-09 23:52:30 +0900] [INFO ] Start Logging. (PID=8283)
+[2013-02-09 23:52:30 +0900] [ERROR] hoge
+[2013-02-09 23:52:30 +0900] [FATAL] Connection refused - connect(2)
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `initialize'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `open'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `tcp_socket'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:555:in `block in do_start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/timeout.rb:58:in `timeout'
+    [backtrace] /usr/local/lib/ruby/1.9.1/timeout.rb:89:in `timeout'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:555:in `do_start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:525:in `start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:463:in `start'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:237:in `send_mail'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:177:in `error'
+    [backtrace] sample/bin/test.rb:4:in `block in <main>'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:157:in `initialize'
+    [backtrace] sample/bin/test.rb:3:in `new'
+    [backtrace] sample/bin/test.rb:3:in `<main>'
+[2013-02-09 23:53:20 +0900] [INFO ] Start Logging. (PID=8715)
+[2013-02-09 23:53:20 +0900] [ERROR] hoge
+[2013-02-09 23:53:20 +0900] [FATAL] Connection refused - connect(2)
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `initialize'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `open'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `tcp_socket'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:555:in `block in do_start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/timeout.rb:58:in `timeout'
+    [backtrace] /usr/local/lib/ruby/1.9.1/timeout.rb:89:in `timeout'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:555:in `do_start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:525:in `start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:463:in `start'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:238:in `send_mail'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:177:in `error'
+    [backtrace] sample/bin/test.rb:4:in `block in <main>'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:157:in `initialize'
+    [backtrace] sample/bin/test.rb:3:in `new'
+    [backtrace] sample/bin/test.rb:3:in `<main>'
+[2013-02-09 23:53:57 +0900] [INFO ] Start Logging. (PID=9030)
+[2013-02-09 23:53:57 +0900] [ERROR] hoge
+[2013-02-09 23:53:57 +0900] [FATAL] Connection refused - connect(2)
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `initialize'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `open'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:546:in `tcp_socket'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:555:in `block in do_start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/timeout.rb:58:in `timeout'
+    [backtrace] /usr/local/lib/ruby/1.9.1/timeout.rb:89:in `timeout'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:555:in `do_start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:525:in `start'
+    [backtrace] /usr/local/lib/ruby/1.9.1/net/smtp.rb:463:in `start'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:238:in `send_mail'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:177:in `error'
+    [backtrace] sample/bin/test.rb:4:in `block in <main>'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:157:in `initialize'
+    [backtrace] sample/bin/test.rb:3:in `new'
+    [backtrace] sample/bin/test.rb:3:in `<main>'
+[2013-02-09 23:54:47 +0900] [INFO ] Start Logging. (PID=9475)
+[2013-02-09 23:54:47 +0900] [ERROR] hoge

data/sample/log/20130210_test.log

@@ -0,0 +1,68 @@
+[2013-02-10 00:20:47 +0900] [INFO ] Start Logging. (PID=22781)
+[2013-02-10 00:20:47 +0900] [ERROR] hoge
+[2013-02-10 00:22:07 +0900] [INFO ] Start Logging. (PID=23451)
+[2013-02-10 00:22:07 +0900] [ERROR] hoge
+[2013-02-10 00:26:18 +0900] [INFO ] Start Logging. (PID=25582)
+[2013-02-10 00:26:18 +0900] [ERROR] hoge
+[2013-02-10 00:27:28 +0900] [INFO ] Start Logging. (PID=26168)
+[2013-02-10 00:27:28 +0900] [ERROR] hoge
+[2013-02-10 00:28:07 +0900] [INFO ] Start Logging. (PID=26488)
+[2013-02-10 00:28:07 +0900] [ERROR] hoge
+[2013-02-10 00:30:05 +0900] [INFO ] Start Logging. (PID=27499)
+[2013-02-10 00:30:05 +0900] [ERROR] 日本語
+[2013-02-10 00:31:26 +0900] [INFO ] Start Logging. (PID=28196)
+[2013-02-10 00:31:26 +0900] [FATAL] undefined local variable or method `sdfa' for main:Object
+    [backtrace] sample/bin/test.rb:5:in `block in <main>'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:157:in `initialize'
+    [backtrace] sample/bin/test.rb:4:in `new'
+    [backtrace] sample/bin/test.rb:4:in `<main>'
+[2013-02-10 00:31:27 +0900] [FATAL] Caught exception. Exit 1
+[2013-02-10 00:32:16 +0900] [INFO ] Start Logging. (PID=28628)
+[2013-02-10 00:32:16 +0900] [FATAL] undefined local variable or method `sdfa' for main:Object
+    [backtrace] sample/bin/test.rb:5:in `block in <main>'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:157:in `initialize'
+    [backtrace] sample/bin/test.rb:4:in `new'
+    [backtrace] sample/bin/test.rb:4:in `<main>'
+[2013-02-10 00:32:16 +0900] [FATAL] Caught exception. Exit 1
+[2013-02-10 00:34:19 +0900] [INFO ] Start Logging. (PID=29673)
+[2013-02-10 00:34:19 +0900] [FATAL] undefined local variable or method `sdfa' for main:Object
+    [backtrace] sample/bin/test.rb:5:in `block in <main>'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:157:in `initialize'
+    [backtrace] sample/bin/test.rb:4:in `new'
+    [backtrace] sample/bin/test.rb:4:in `<main>'
+[2013-02-10 00:34:19 +0900] [FATAL] Caught exception. Exit 1
+[2013-02-10 00:40:24 +0900] [INFO ] Start Logging. (PID=372)
+[2013-02-10 00:40:24 +0900] [FATAL] undefined local variable or method `sdfa' for main:Object
+    [backtrace] sample/bin/test.rb:5:in `block in <main>'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:157:in `initialize'
+    [backtrace] sample/bin/test.rb:4:in `new'
+    [backtrace] sample/bin/test.rb:4:in `<main>'
+[2013-02-10 00:40:24 +0900] [FATAL] Caught exception. Exit 1
+[2013-02-10 00:40:53 +0900] [INFO ] Start Logging. (PID=638)
+[2013-02-10 00:40:53 +0900] [FATAL] undefined local variable or method `sdfa' for main:Object
+    [backtrace] sample/bin/test.rb:5:in `block in <main>'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:157:in `initialize'
+    [backtrace] sample/bin/test.rb:4:in `new'
+    [backtrace] sample/bin/test.rb:4:in `<main>'
+[2013-02-10 00:40:53 +0900] [FATAL] Caught exception. Exit 1
+[2013-02-10 00:41:08 +0900] [INFO ] Start Logging. (PID=759)
+[2013-02-10 00:41:08 +0900] [FATAL] undefined local variable or method `sdfa' for main:Object
+    [backtrace] sample/bin/test.rb:5:in `block in <main>'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:157:in `initialize'
+    [backtrace] sample/bin/test.rb:4:in `new'
+    [backtrace] sample/bin/test.rb:4:in `<main>'
+[2013-02-10 00:41:08 +0900] [FATAL] Caught exception. Exit 1
+[2013-02-10 00:48:46 +0900] [INFO ] Start Logging. (PID=4706)
+[2013-02-10 00:48:46 +0900] [FATAL] undefined local variable or method `sdfa' for main:Object
+    [backtrace] sample/bin/test.rb:5:in `block in <main>'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:157:in `initialize'
+    [backtrace] sample/bin/test.rb:4:in `new'
+    [backtrace] sample/bin/test.rb:4:in `<main>'
+[2013-02-10 00:48:46 +0900] [FATAL] Caught exception. Exit 1
+[2013-02-10 00:49:11 +0900] [INFO ] Start Logging. (PID=4922)
+[2013-02-10 00:49:11 +0900] [FATAL] undefined local variable or method `sdfa' for main:Object
+    [backtrace] sample/bin/test.rb:5:in `block in <main>'
+    [backtrace] /root/rbatch/lib/rbatch/log.rb:157:in `initialize'
+    [backtrace] sample/bin/test.rb:4:in `new'
+    [backtrace] sample/bin/test.rb:4:in `<main>'
+[2013-02-10 00:49:11 +0900] [FATAL] Caught exception. Exit 1

data/test/cases/test_cmd.rb

@@ -117,4 +117,16 @@ class RuncherTest < Test::Unit::TestCase
       RBatch::cmd(cmd_str,opt)
     }
   end
+  def test_opt_timeout
+    cmd_str = "ruby -e 'sleep 2'"
+    opt = {:timeout => 1}
+    assert_raise(RBatch::CmdException){
+      RBatch::cmd(cmd_str,opt)
+    }
+  end
+  def test_opt_timeout
+    cmd_str = "ruby -e 'sleep 1'"
+    opt = {:timeout => 2}
+    RBatch::cmd(cmd_str,opt)
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: rbatch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors: 
 - fetaro
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-30 00:00:00 Z
+date: 2013-02-09 00:00:00 Z
 dependencies: []
 
 description: ""
@@ -44,12 +44,15 @@ files:
 - sample/data/amAuthentication.error.2012-07-10
 - sample/data/amAgent_localhost_80.log.1
 - sample/data/amAuthentication.access.1
+- sample/log/20130131_apache_log_insert.log
 - sample/log/20130120_openam_log_insert.log
+- sample/log/20130210_test.log
 - sample/log/20130122_apache_log_insert.log
 - sample/log/20130122_openam_log_insert.log
 - sample/log/20130121_webagent_log_insert.log
 - sample/log/20130129_log_backup.log
 - sample/log/20130121_file_batch_copy.log
+- sample/log/20130209_test.log
 - sample/log/20130120_apache_log_insert.log
 - sample/log/empty
 - sample/log/20130122_webagent_log_insert.log
@@ -63,9 +66,11 @@ files:
 - sample/conf/file_batch_copy.yaml
 - sample/conf/rbatch.yaml
 - sample/conf/openam_log_insert.yaml
+- sample/bin/test2.rb
 - sample/bin/apache_log_insert.rb
 - sample/bin/openldap_backup.rb
 - sample/bin/webagent_log_insert.rb
+- sample/bin/test.rb
 - sample/bin/mysql_data_backup.rb
 - sample/bin/openam_log_insert.rb
 - sample/bin/file_batch_copy.rb
@@ -134,6 +139,7 @@ files:
 - doc/rdoc/js/thickbox-compressed.js
 - doc/rdoc/LICENSE.html
 - doc/rdoc/CHANGELOG.html
+- doc/rdoc/RBatchException.html
 homepage: https://github.com/fetaro/rbatch
 licenses: []