rbatch 1.6.6 → 1.7.0

data/lib/rbatch/log.rb

@@ -41,7 +41,6 @@ module RBatch
     @@def_opt = {
       :name      => "<date>_<time>_<prog>.log",
       :dir       => File.join(File.dirname(RBatch.program_name), ".." , "log"),
-      :formatter => nil,
       :append    => true,
       :level     => "info",
       :stdout    => false,
@@ -80,7 +79,6 @@ module RBatch
     # - +:dir+ (String) = log direcotry path. Default is "../log"
     # - +:level+ (String) = log level. ["debug"|"info"|"warn"|"error"|"fatal"] . Default is "info".
     # - +:append+ (Boolean) = appned to log or not(=overwrite). Default is ture.
-    # - +:formatter+ (Logger#formatter) = log formatter. instance of Logger#formatter
     # - +:stdout+ (Boolean) = print string both logfile and STDOUT. Default is false.
     # - +:quiet+ (Boolean) = run quiet mode. print STDOUT nothing.  Default is true.
     # ==== Block params
@@ -125,23 +123,35 @@ module RBatch
         raise e
       end
       # set logger option
+      formatter = proc do |severity, datetime, progname, msg|
+        head = "[#{datetime}] [" + sprintf("%-5s",severity) +"]"
+        if msg.is_a? Exception
+          "#{head} #{msg}\n" + msg.backtrace.map{|s| "    [backtrace] #{s}"}.join("\n") + "\n"
+        else
+          "#{head} #{msg}\n"
+        end
+      end
       @log.formatter = @opt[:formatter] if @opt[:formatter]
       @log.level = @@log_level_map[@opt[:level]]
+      @log.formatter = formatter
       if @opt[:stdout]
         # ccreate Logger instance for STDOUT
         @stdout_log = Logger.new(STDOUT)
         @stdout_log.formatter = @opt[:formatter] if @opt[:formatter]
         @stdout_log.level = @@log_level_map[@opt[:level]]
+        @stdout_log.formatter = formatter
       end
       puts "Log file: " + path if ! @opt[:quiet]
       # delete old log
       self.delete_old_log(@opt[:delete_old_log_date]) if @opt[:delete_old_log]
+      # Start logging
+      self.info("Start Logging. (PID=#{$$.to_s})") if ! @opt[:quiet]
       if block_given?
         begin
           yield self
         rescue => e
-          self.fatal("Caught exception; existing 1")
           self.fatal(e)
+          self.fatal("Caught exception. Exit 1")
           exit 1
         ensure
           self.close

data/sample/bin/log_backup.rb

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+require 'rbatch'
+require 'fileutils'
+require 'date'
+
+RBatch::Log.new do |log|
+  log.info("Start---------------")
+  target_dir = RBatch::config["target_dir"]
+  RBatch::config["file_list"].each do |file_wildcard|
+    Dir::glob(file_wildcard).each do |file|
+      if ! File.exists?(File.join(target_dir,File.basename(file)))
+        log.info("Copy " + file + " to " + target_dir)
+        FileUtils.cp(file,target_dir)
+      else
+        log.info("Skip " + file + " (already backuped)")
+      end
+    end
+  end
+end
+

data/sample/conf/log_backup.yaml

@@ -0,0 +1,4 @@
+file_list:
+  - /var/log/hoge*
+  - /var/log/messages
+target_dir: /tmp

data/sample/log/20130129_log_backup.log

@@ -0,0 +1,95 @@
+F, [2013-01-29T01:06:32.530732 #23428] FATAL -- : Caught exception; existing 1
+F, [2013-01-29T01:06:32.530799 #23428] FATAL -- : undefined local variable or method `file' for main:Object (NameError)
+bin/log_backup.rb:11:in `block (2 levels) in <main>'
+bin/log_backup.rb:10:in `each'
+bin/log_backup.rb:10:in `block in <main>'
+/usr/local/lib/ruby/gems/1.9.1/gems/rbatch-1.6.4/lib/rbatch/log.rb:141:in `initialize'
+bin/log_backup.rb:6:in `new'
+bin/log_backup.rb:6:in `<main>'
+F, [2013-01-29T01:06:50.003592 #23432] FATAL -- : Caught exception; existing 1
+F, [2013-01-29T01:06:50.003659 #23432] FATAL -- : undefined local variable or method `file' for main:Object (NameError)
+bin/log_backup.rb:11:in `block (2 levels) in <main>'
+bin/log_backup.rb:10:in `each'
+bin/log_backup.rb:10:in `block in <main>'
+/usr/local/lib/ruby/gems/1.9.1/gems/rbatch-1.6.4/lib/rbatch/log.rb:141:in `initialize'
+bin/log_backup.rb:6:in `new'
+bin/log_backup.rb:6:in `<main>'
+F, [2013-01-29T01:07:08.564091 #23440] FATAL -- : Caught exception; existing 1
+F, [2013-01-29T01:07:08.564156 #23440] FATAL -- : undefined local variable or method `target_dir' for main:Object (NameError)
+bin/log_backup.rb:12:in `block (3 levels) in <main>'
+bin/log_backup.rb:11:in `each'
+bin/log_backup.rb:11:in `block (2 levels) in <main>'
+bin/log_backup.rb:10:in `each'
+bin/log_backup.rb:10:in `block in <main>'
+/usr/local/lib/ruby/gems/1.9.1/gems/rbatch-1.6.4/lib/rbatch/log.rb:141:in `initialize'
+bin/log_backup.rb:6:in `new'
+bin/log_backup.rb:6:in `<main>'
+I, [2013-01-29T01:07:16.499840 #23444]  INFO -- : cp -n /var/log/hoge-20130128 /tmp
+I, [2013-01-29T01:07:16.502419 #23444]  INFO -- : cp -n /var/log/hoge /tmp
+I, [2013-01-29T01:07:16.504333 #23444]  INFO -- : cp -n /var/log/hoge-20130125 /tmp
+I, [2013-01-29T01:07:16.506443 #23444]  INFO -- : cp -n /var/log/hoge-20130126 /tmp
+I, [2013-01-29T01:07:16.508351 #23444]  INFO -- : cp -n /var/log/hoge-20130129 /tmp
+I, [2013-01-29T01:07:16.511586 #23444]  INFO -- : cp -n /var/log/hoge-20130127 /tmp
+I, [2013-01-29T01:07:24.653182 #23458]  INFO -- : cp -n /var/log/hoge-20130128 /tmp
+I, [2013-01-29T01:07:24.655595 #23458]  INFO -- : cp -n /var/log/hoge /tmp
+I, [2013-01-29T01:07:24.657416 #23458]  INFO -- : cp -n /var/log/hoge-20130125 /tmp
+I, [2013-01-29T01:07:24.659331 #23458]  INFO -- : cp -n /var/log/hoge-20130126 /tmp
+I, [2013-01-29T01:07:24.661271 #23458]  INFO -- : cp -n /var/log/hoge-20130129 /tmp
+I, [2013-01-29T01:07:24.663294 #23458]  INFO -- : cp -n /var/log/hoge-20130127 /tmp
+I, [2013-01-29T01:09:20.323944 #23486]  INFO -- : cp -n /var/log/hoge-20130128 /tmp
+I, [2013-01-29T01:09:20.326497 #23486]  INFO -- : cp -n /var/log/hoge /tmp
+I, [2013-01-29T01:09:20.329530 #23486]  INFO -- : cp -n /var/log/hoge-20130125 /tmp
+I, [2013-01-29T01:09:20.331360 #23486]  INFO -- : cp -n /var/log/hoge-20130126 /tmp
+I, [2013-01-29T01:09:20.333126 #23486]  INFO -- : cp -n /var/log/hoge-20130129 /tmp
+I, [2013-01-29T01:09:20.334846 #23486]  INFO -- : cp -n /var/log/hoge-20130127 /tmp
+I, [2013-01-29T01:12:34.333412 #23533]  INFO -- : cp -n /var/log/hoge-20130128 /tmp
+I, [2013-01-29T01:12:34.336134 #23533]  INFO -- : cp -n /var/log/hoge /tmp
+I, [2013-01-29T01:12:34.338090 #23533]  INFO -- : cp -n /var/log/hoge-20130125 /tmp
+I, [2013-01-29T01:12:34.340136 #23533]  INFO -- : cp -n /var/log/hoge-20130126 /tmp
+I, [2013-01-29T01:12:34.342096 #23533]  INFO -- : cp -n /var/log/hoge-20130129 /tmp
+I, [2013-01-29T01:12:34.343905 #23533]  INFO -- : cp -n /var/log/hoge-20130127 /tmp
+I, [2013-01-29T01:14:08.628838 #23592]  INFO -- : /var/log/hoge-20130128 is already backuped
+I, [2013-01-29T01:14:08.628894 #23592]  INFO -- : /var/log/hoge is already backuped
+I, [2013-01-29T01:14:08.629061 #23592]  INFO -- : /var/log/hoge-20130125 is already backuped
+I, [2013-01-29T01:14:08.629104 #23592]  INFO -- : /var/log/hoge-20130126 is already backuped
+I, [2013-01-29T01:14:08.629145 #23592]  INFO -- : /var/log/hoge-20130129 is already backuped
+I, [2013-01-29T01:14:08.629186 #23592]  INFO -- : /var/log/hoge-20130127 is already backuped
+I, [2013-01-29T01:14:20.564898 #23595]  INFO -- : /var/log/hoge-20130128 is already backuped
+I, [2013-01-29T01:14:20.564949 #23595]  INFO -- : /var/log/hoge is already backuped
+I, [2013-01-29T01:14:20.564991 #23595]  INFO -- : copy /var/log/hoge-20130125 to /tmp
+I, [2013-01-29T01:14:20.566881 #23595]  INFO -- : /var/log/hoge-20130126 is already backuped
+I, [2013-01-29T01:14:20.566926 #23595]  INFO -- : /var/log/hoge-20130129 is already backuped
+I, [2013-01-29T01:14:20.566968 #23595]  INFO -- : /var/log/hoge-20130127 is already backuped
+I, [2013-01-29T01:15:16.141526 #23611]  INFO -- : skip /var/log/hoge-20130128(already backuped)
+I, [2013-01-29T01:15:16.141589 #23611]  INFO -- : skip /var/log/hoge(already backuped)
+I, [2013-01-29T01:15:16.141660 #23611]  INFO -- : skip /var/log/hoge-20130125(already backuped)
+I, [2013-01-29T01:15:16.141740 #23611]  INFO -- : skip /var/log/hoge-20130126(already backuped)
+I, [2013-01-29T01:15:16.141848 #23611]  INFO -- : skip /var/log/hoge-20130129(already backuped)
+I, [2013-01-29T01:15:16.141921 #23611]  INFO -- : skip /var/log/hoge-20130127(already backuped)
+I, [2013-01-29T01:15:23.973832 #23615]  INFO -- : skip /var/log/hoge-20130128 (already backuped)
+I, [2013-01-29T01:15:23.973913 #23615]  INFO -- : skip /var/log/hoge (already backuped)
+I, [2013-01-29T01:15:23.973991 #23615]  INFO -- : skip /var/log/hoge-20130125 (already backuped)
+I, [2013-01-29T01:15:23.974164 #23615]  INFO -- : skip /var/log/hoge-20130126 (already backuped)
+I, [2013-01-29T01:15:23.974211 #23615]  INFO -- : skip /var/log/hoge-20130129 (already backuped)
+I, [2013-01-29T01:15:23.974252 #23615]  INFO -- : skip /var/log/hoge-20130127 (already backuped)
+I, [2013-01-29T01:15:51.878823 #23621]  INFO -- : skip /var/log/hoge-20130128 (already backuped)
+I, [2013-01-29T01:15:51.878874 #23621]  INFO -- : skip /var/log/hoge (already backuped)
+I, [2013-01-29T01:15:51.878916 #23621]  INFO -- : copy /var/log/hoge-20130125 to /tmp
+I, [2013-01-29T01:15:51.880742 #23621]  INFO -- : copy /var/log/hoge-20130126 to /tmp
+I, [2013-01-29T01:15:51.880900 #23621]  INFO -- : skip /var/log/hoge-20130129 (already backuped)
+I, [2013-01-29T01:15:51.880943 #23621]  INFO -- : skip /var/log/hoge-20130127 (already backuped)
+I, [2013-01-29T01:16:21.454513 #23625]  INFO -- : Skip /var/log/hoge-20130128 (already backuped)
+I, [2013-01-29T01:16:21.454595 #23625]  INFO -- : Skip /var/log/hoge (already backuped)
+I, [2013-01-29T01:16:21.454681 #23625]  INFO -- : Skip /var/log/hoge-20130125 (already backuped)
+I, [2013-01-29T01:16:21.454747 #23625]  INFO -- : Skip /var/log/hoge-20130126 (already backuped)
+I, [2013-01-29T01:16:21.454790 #23625]  INFO -- : Skip /var/log/hoge-20130129 (already backuped)
+I, [2013-01-29T01:16:21.454831 #23625]  INFO -- : Skip /var/log/hoge-20130127 (already backuped)
+I, [2013-01-29T01:16:21.454999 #23625]  INFO -- : Copy /var/log/messages to /tmp
+I, [2013-01-29T01:17:44.487387 #23636]  INFO -- : Start---------------
+I, [2013-01-29T01:17:44.487545 #23636]  INFO -- : Skip /var/log/hoge-20130128 (already backuped)
+I, [2013-01-29T01:17:44.487603 #23636]  INFO -- : Skip /var/log/hoge (already backuped)
+I, [2013-01-29T01:17:44.487644 #23636]  INFO -- : Skip /var/log/hoge-20130125 (already backuped)
+I, [2013-01-29T01:17:44.487734 #23636]  INFO -- : Skip /var/log/hoge-20130126 (already backuped)
+I, [2013-01-29T01:17:44.487805 #23636]  INFO -- : Skip /var/log/hoge-20130129 (already backuped)
+I, [2013-01-29T01:17:44.487871 #23636]  INFO -- : Skip /var/log/hoge-20130127 (already backuped)
+I, [2013-01-29T01:17:44.487955 #23636]  INFO -- : Copy /var/log/messages to /tmp

data/test/cases/test_log.rb

@@ -122,13 +122,6 @@ class LoggerTest < Test::Unit::TestCase
     end
   end
 
-  def test_change_formatte
-    RBatch::Log.new({:name => "file" , :formatter => proc { |severity, datetime, progname, msg| "test_change_formatte#{msg}\n" }}) do | log |
-      log.info("bar")
-    end
-    File::open(File.join(@dir,"file")) {|f| assert_match /test_change_formatte/, f.read }
-  end
-
   def test_nest_block
     RBatch::Log.new({:name => "name1" }) do | log |
       log.info("name1")

metadata

@@ -2,7 +2,7 @@
 name: rbatch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.6.6
+  version: 1.7.0
 platform: ruby
 authors: 
 - fetaro
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-22 00:00:00 Z
+date: 2013-01-30 00:00:00 Z
 dependencies: []
 
 description: ""
@@ -48,6 +48,7 @@ files:
 - 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/20130120_apache_log_insert.log
 - sample/log/empty
@@ -57,6 +58,7 @@ files:
 - sample/conf/openldap_backup.yaml
 - sample/conf/webagent_log_insert.yaml
 - sample/conf/apache_log_insert.yaml
+- sample/conf/log_backup.yaml
 - sample/conf/mysql_data_backup.yaml
 - sample/conf/file_batch_copy.yaml
 - sample/conf/rbatch.yaml
@@ -67,6 +69,7 @@ files:
 - sample/bin/mysql_data_backup.rb
 - sample/bin/openam_log_insert.rb
 - sample/bin/file_batch_copy.rb
+- sample/bin/log_backup.rb
 - sample/moto/README
 - sample/moto/gradlew
 - sample/moto/gradle.properties
@@ -157,6 +160,6 @@ rubyforge_project:
 rubygems_version: 1.7.1
 signing_key: 
 specification_version: 3
-summary: batch framework
+summary: simple batch framework
 test_files: []