rbatch 2.1.9 → 2.2.0

data/CHANGELOG

@@ -1,7 +1,8 @@
 CHANGE LOG
 
-This document includes functions which is added or changed, does not include bugfix.
-About bugfix, see commit log of https://github.com/fetaro/rbatch .
+This document includes functions which is added or changed.
+This document does NOT include bugfix.
+If you want to know about bug fix, please see commit logs of https://github.com/fetaro/rbatch .
 
 ===================
 version 1
@@ -13,64 +14,61 @@ version 1
 
 1.1 (2012/11/9)
 -----
-* add common config file
-* change log option
+* [add] common config file
+* [change] new option : "log"
 
 1.2 (2012/11/13)
 -----
-* change log level option format
-* add log append option
+* [change] log level option format
+* [add] new option : "log_append"
 
 1.3 (2012/12/30)
 -----
-* add RBatch::Log to instance interface
-* add double run check option
+* [add] add customize point to RBatch::Log's constructor
+* [add] new option : "double_run_check"
 
 1.4 (2013/1/5)
 ----
-* add log_stdout option
-* add sample code
-* add cmd_raise option
-* add log_delete_old_log option
+* [add] new options : "log_stdout", "cmd_raise", "log_delete_old_log"
+* [add] add sample code
 
 1.5 (2013/1/11)
 ----
-* change default config dir "../config" -> "../conf"
+* [change] change default config dir from "../config" to "../conf"
 
 1.6 (2013/1/14)
 ----
-* add config key check
+* [add] add function of cheking config keys
 
 1.7 (2013/01/30)
 ----
-* change log format
-* delete change log format option
+* [change] log format
+* [delete] change log format option
 
 1.8 (2013/02/10)
 ----
-* add log_send_mail option
-* add cmd_timeout option
+* [add] new option : "log_send_mail", "cmd_timeout"
 
 1.9 (2013/02/11)
 ----
-* add "<host>" keyword to log_name option
-* change Environmental variables ($TMPDIR and $HOSTNAME) are checked strictly 
+* [add] add "<host>" keyword to log_name option
+* [change] Environmental variables ($TMPDIR and $HOSTNAME) are checked strictly 
 
 1.10 (2013/02/12)
 ----
-* add rbatch-init command
+* [add] add rbatch-init command
 
 1.11 (2013/02/24)
 ----
-* add support for MAC-OSX environment (change handling of the environment variable about hostname and temporary directory)
+* [add] support for MAC-OSX environment (change handling of the environment variable about hostname and temporary directory)
 
 1.12 (2013/11/19)
 ----
-* add Common Config Function
+* [add] add Common Config Function
 
 1.13 (2013/12/19)
 ----
-* add customize point that can change RBatch home directory by using the environment variables, ${RB_HOME}.
+* [add] add customize point that can change RBatch home directory by using the environment variables, ${RB_HOME}.
 
 ===================
 version 2
@@ -78,15 +76,19 @@ version 2
 
 2.0.0 (2013/12/28)
 ----
-* change Run-Conf path from "${RB_HOME}/conf/rbatch.yaml" to "${RB_HOME}/.rbatchrc"
-* add checking existence of Run-Conf keys.
-* add option. "conf_dir", "common_conf_name",  and "cmd_timeout" are added.
-* when cmd_timeout occured, RBatch kill child process now. 
-* change test code from Test::Unit to RSpec. 
+* [change] Change Run-Conf path from "${RB_HOME}/conf/rbatch.yaml" to "${RB_HOME}/.rbatchrc"
+* [add] add function of checking existence of Run-Conf's keys.
+* [add] new options : "conf_dir", "common_conf_name", "cmd_timeout".
+* [add] when cmd_timeout occured, RBatch kill child process now. 
+* [change] Change test code from Test::Unit to RSpec. 
 
 2.1.0 (2013/1/10)
 ----
-* add error handling when key class mistake Symbol for String
-* add auto library file reading
-* add mix_rbatch_msg_to_log option
-* change config reading timing. before ondemand, now initial.
+* [add] add an error handling when user mistake key class as Symbol for String in config file.
+* [add] add function of auto library file reading
+* [add] new option : "mix_rbatch_msg_to_log"
+* [change] config reading timing. before ondemand, now initial.
+
+2.2.0 (2014/4/15)
+----
+* [add] now "log_mail_to" option accepts multiple recipients, before it accepts only one recipient.

data/README.ja.md

@@ -315,21 +315,29 @@ Run-Conf(`${RB_HOME}/.rbatchrc`)のサンプルは以下の通り
 #forbid_double_run : true
 #forbid_double_run : false
 
-# RBatchの実行ログ(Journal)のLevel
+# RBatchジャーナルのLevel
 #
 #   デフォルトは1
-#   大きい数を指定すると多くの実行ログが出力される。
+#   RBatchジャーナルはRBatch自体の実行ログであり、[RBatch] の接頭辞が
+#   付くメッセージである。通常は標準出力に出力される
+#   大きい数を指定すると多くのジャーナルが出力される。
 #   0を指定すると何も表示されない。
-#   RBatchメッセージの例
-#       [RBatch] Load Config  : "../conf/hoge.yaml"
+#
+#   RBatchジャーナルの例
+#     [RBatch] === START RBatch === (PID=5795)
+#     [RBatch] RB_HOME : "/path/to/"
+#     [RBatch] Load Run-Conf: "/path/to/.rbatchrc"
+#     [RBatch] Start Script : "/path/to/bin/hello.rb"
+#     ....
 #
 #rbatch_journal_level : 2
 #rbatch_journal_level : 0
 
-# RBatchの実行ログをログに混ぜ込む
+# RBatchジャーナルをログに混ぜ込む
 #
 #   デフォルトは true。
-#   trueを指定すると、RBatchメッセージをその時開かれているログに混ぜこむ。
+#   trueを指定すると、RBatchジャーナルを標準出力だけでなく
+#   その時開かれているログにも出力する。
 #
 #mix_rbatch_journal_to_logs : true
 #mix_rbatch_journal_to_logs : false
@@ -409,6 +417,13 @@ Run-Conf(`${RB_HOME}/.rbatchrc`)のサンプルは以下の通り
 #log_mail_from : "xxx@sample.com"
 #log_mail_server_host : "localhost"
 #log_mail_server_port : 25
+#
+# 宛先を複数指定した場合は
+#
+#log_mail_to :
+#  - "AAA@sample.com"
+#  - "BBB@sample.com"
+
 
 # -------------------
 # 外部コマンド実行関連

data/README.md

@@ -313,21 +313,28 @@ Sample of RBatch Run-Conf `${RB_HOME}/.rbatchrc`.
 #forbid_double_run: true
 #forbid_double_run: false
 
-# Journal Message Level
+# RBatch Journal Level
 #
 #   Default is 1
-#   If 2, put more journal messages to STDOUT.
+#   RBatch Journal is message of RBatch and is output to STDOUT. 
+#   If 2, put much more information.
 #   If 0, put nothing.
-#   Example of journal essages are follows.
-#       [RBatch] Load Config  : "../conf/hoge.yaml"
+#
+#   Example of RBatch Journal are follows.
+#     [RBatch] === START RBatch === (PID=5795)
+#     [RBatch] RB_HOME : "/path/to/"
+#     [RBatch] Load Run-Conf: "/path/to/.rbatchrc"
+#     [RBatch] Start Script : "/path/to/bin/hello.rb"
+#     ....
 #
 #rbatch_journal_level : 2
 #rbatch_journal_level : 0
 
-# Mix Journal Message to Logs
+# Mix RBatch Journal to Logs
 #
 #   Default is true.
-#   If true, mix RBatch journal messages to log file(s) which is(are) opened at time.
+#   If true, RBatch Journal is output not only STDOUT
+#   but also log file(s) which is(are) opened at time.
 #
 #mix_rbatch_journal_to_logs : true
 #mix_rbatch_journal_to_logs : false
@@ -406,6 +413,12 @@ Sample of RBatch Run-Conf `${RB_HOME}/.rbatchrc`.
 #log_mail_from : "xxx@sample.com"
 #log_mail_server_host : "localhost"
 #log_mail_server_port : 25
+#
+# if you want to send multiple recipients...
+#
+#log_mail_to :
+#  - "AAA@sample.com"
+#  - "BBB@sample.com"
 
 # -------------------
 # Cmd setting

data/bin/rbatch-init

@@ -47,21 +47,28 @@ contents[".rbatchrc"] = <<EOF
 #forbid_double_run : true
 #forbid_double_run : false
 
-# Journal Message Level
+# RBatch Journal Level
 #
 #   Default is 1
-#   If 2, put more journal messages to STDOUT.
+#   RBatch Journal is message of RBatch and is output to STDOUT. 
+#   If 2, put much more information.
 #   If 0, put nothing.
-#   Example of journal essages are follows.
-#       [RBatch] Load Config  : "../conf/hoge.yaml"
+#
+#   Example of RBatch Journal are follows.
+#     [RBatch] === START RBatch === (PID=5795)
+#     [RBatch] RB_HOME : "/path/to/"
+#     [RBatch] Load Run-Conf: "/path/to/.rbatchrc"
+#     [RBatch] Start Script : "/path/to/bin/hello.rb"
+#     ....
 #
 #rbatch_journal_level : 2
 #rbatch_journal_level : 0
 
-# Mix Journal Message to Logs
+# Mix RBatch Journal to Logs
 #
 #   Default is true.
-#   If true, mix RBatch journal messages to log file(s) which is(are) opened at time.
+#   If true, RBatch Journal is output not only STDOUT
+#   but also log file(s) which is(are) opened at time.
 #
 #mix_rbatch_journal_to_logs : true
 #mix_rbatch_journal_to_logs : false
@@ -141,6 +148,12 @@ contents[".rbatchrc"] = <<EOF
 #log_mail_from : "xxx@sample.com"
 #log_mail_server_host : "localhost"
 #log_mail_server_port : 25
+#
+# if you want to send multiple recipients...
+#
+#log_mail_to :
+#  - "AAA@sample.com"
+#  - "BBB@sample.com"
 
 # -------------------
 # Cmd setting

data/lib/rbatch/log.rb

@@ -234,9 +234,15 @@ module RBatch
     end
 
     def send_mail(msg)
+      if @vars[:log_mail_to].class == Array
+        mail_to_str = @vars[:log_mail_to].join(",")
+      else
+        mail_to_str = @vars[:log_mail_to]
+      end
+
       body = <<EOT
-From: <#{@vars[:log_mail_from]}>
-To: <#{@vars[:log_mail_to]}>
+From: #{@vars[:log_mail_from]}
+To: #{mail_to_str}
 Subject: [RBatch] #{@vars[:program_name]} has error
 Date: #{Time::now.strftime("%a, %d %b %Y %X %z")}
 Mime-Version: 1.0
@@ -248,6 +254,7 @@ EOT
       Net::SMTP.start(@vars[:log_mail_server_host],@vars[:log_mail_server_port] ) {|smtp|
         smtp.send_mail(body,@vars[:log_mail_from],@vars[:log_mail_to])
       }
+      @@journal.put 1,"Send an error mail from #{@vars[:log_mail_from]} to #{mail_to_str} by #{@vars[:log_mail_server_host]}:#{@vars[:log_mail_server_port]}"
     end
   end # end class
   class LogException < StandardError ; end

data/lib/rbatch/version.rb

@@ -1,3 +1,3 @@
 module RBatch
-  VERSION = "2.1.9"
+  VERSION = "2.2.0"
 end

metadata

@@ -2,7 +2,7 @@
 name: rbatch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.9
+  version: 2.2.0
 platform: ruby
 authors: 
 - fetaro