batch_manager 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f126c36d799f8c8ecf3e7f5d6d2f516039a6ef9
-  data.tar.gz: 24ec977d830ca47e3ba5b742dfd7d03c1110f1b3
+  metadata.gz: 6415687d75bbd24e14c61db0eb8458876583c8cd
+  data.tar.gz: 9bdbb1e0d415f6f04c479db2ef9ba03e8695ace3
 SHA512:
-  metadata.gz: d6ed61ecfe20421b6c14dc831fc55cdc9c9c812336afc89e2ef301f573fe34406a1c241209fe0c5c55f1da0d4b49533e4fc8553f4b920dddbfc0d72258046c92
-  data.tar.gz: 2b1e126e9575b5965bc713b635cfded66c6f03dfdf2c0cbce067f1726fda35a52ad91b50cdf9c2acbde3f183f7c5e8fa32448ce1aa4dc4c89cff84ca55f6ef48
+  metadata.gz: 48b4a7f60176ac7f2fb2b37ed6394a00e82e05ea3281ef4f4e4d084bf97fdef2ad051934abc8f9acfdf968cd3caffb63f6b8880a214c83e2cbd3ab7ce987934b
+  data.tar.gz: e02cd3b2a8f0bf9748d690e9481d4ccef257a6d692c68de207d49a4aa64c666f0c187c2a069ca0e38fbe87eb75e6f63e6f1b471fb6712d926f97187b357441f0

data/README.md

@@ -57,9 +57,20 @@ You can also add these headers to the existing batch files.
 
 Please use this command instead of 'rails runner' to run batch scripts.
 
-    option:
-      -f, --force
-      -w, --wet
+    options:
+      -f, --force                      Force to run
+      -w, --wet                        Wet run
+      -d, --daemon COMMAND             Daemon mode
+
+### Daemon mode
+
+Use `-d` option to run batch as daemon.
+
+    # start daemon
+    bundle exec bm_exec -d start BATCH_FILE
+
+    # stop daemon
+    bundle exec bm_exec -d stop BATCH_FILE
 
 ## Logger
 

data/bin/bm_exec

@@ -8,16 +8,20 @@ require 'batch_manager'
 options = {}
 batch_file = nil
 ARGV.clone.options do |opts|
-  opts.banner = "Usage: batch [options] BATCH_FILE"
+  opts.banner = "Usage: bm_exec [options] BATCH_FILE"
   opts.on("-f", "--force", "Force to run") { options[:force] = true }
   opts.on("-w", "--wet", "Wet run") { options[:wet] = true }
+  opts.on("-d", "--daemon COMMAND", "Daemon mode") { |cmd| options[:daemon] = cmd }
   opts.order! { |o| batch_file ||= o } rescue retry
 end
 ARGV.delete(batch_file)
 
 APP_PATH = File.join('.', 'config', 'application')
 require APP_PATH
-#ENV["RAILS_ENV"] = options[:environment] || "development"
 Rails.application.require_environment!
 
-BatchManager::Executor.exec(batch_file, options)
+if options[:daemon]
+  BatchManager::Daemon.spawn(options[:daemon], batch_file, options)
+else
+  BatchManager::Executor.exec(batch_file, options)
+end

data/lib/batch_manager/daemon.rb

@@ -0,0 +1,34 @@
+require "daemon_spawn"
+
+module BatchManager
+  class Daemon
+    include BatchManager::Utils
+
+    class << self
+      def spawn(command, batch_file, options = {})
+        daemon_options = {
+          working_dir: Rails.root.to_s,
+          pid_file: pid_file_path(batch_name(batch_file), options[:wet]),
+          log_file: BatchManager::Logger.log_file_path(batch_name(batch_file), options[:wet]),
+          sync_log: true
+        }
+        FileUtils.mkdir_p(File.dirname(daemon_options[:pid_file]), :mode => 0775)
+        Spawn.spawn!(daemon_options, [command, batch_file, options])
+      end
+
+      def pid_file_path(batch_name, is_wet = false)
+        pid_file_name = is_wet ? "#{batch_name}_wet" : batch_name
+        File.join(BatchManager.log_dir, pid_file_name) + ".pid"
+      end
+    end
+
+    class Spawn < ::DaemonSpawn::Base
+      def start(args)
+        BatchManager::Executor.exec(args[0], args[1])
+      end
+
+      def stop
+      end
+    end
+  end
+end

data/lib/batch_manager/executor.rb

@@ -8,8 +8,9 @@ module BatchManager
         if File.exist?(@batch_file_path)
           @batch_status = BatchManager::BatchStatus.new(@batch_file_path)
           @wet = options[:wet]
+          @disable_stdout = options[:daemon]
           if options[:force] || !@wet || @batch_status.can_run?
-            logging_run_duration { exec_batch_script }
+            log_run_duration { exec_batch_script }
           else
             raise "Cannot run this batch."
           end
@@ -20,8 +21,8 @@ module BatchManager
 
       protected
 
-      def logging_run_duration
-        @logger = BatchManager::Logger.new(@batch_status.name, @wet)
+      def log_run_duration
+        @logger = BatchManager::Logger.new(@batch_status.name, @wet, @disable_stdout)
         start_at = Time.now
         yield
         end_at = Time.now

data/lib/batch_manager/logger.rb

@@ -13,9 +13,9 @@ module BatchManager
       end
     end
 
-    def initialize(batch_name, is_wet)
+    def initialize(batch_name, is_wet, disable_stdout = false)
       @logger = Log4r::Logger.new(batch_name)
-      @logger.outputters << Log4r::Outputter.stdout
+      @logger.outputters << Log4r::Outputter.stdout unless disable_stdout
       if BatchManager.save_log?
         @log_file = prepare_log_file(batch_name, is_wet)
         @logger.outputters << Log4r::FileOutputter.new(File.basename(@log_file, ".log"), :filename => @log_file)

data/lib/batch_manager/version.rb

@@ -1,3 +1,3 @@
 module BatchManager
-  VERSION = "0.3.9"
+  VERSION = "0.4.0"
 end

data/lib/batch_manager.rb

@@ -37,3 +37,4 @@ require 'batch_manager/batch_status'
 require 'batch_manager/executor'
 require 'batch_manager/monitor'
 require "batch_manager/logger"
+require "batch_manager/daemon"

data/lib/generators/batch/templates/active_record/batch.rb

@@ -3,13 +3,12 @@
 # =created_at:  <%= Time.now.strftime "%Y-%m-%d %H:%M:%S" %>
 # =times_limit: 1
 
-wet_run = (ARGV[0] == "wet" || @wet)
-
 ActiveRecord::Base.transaction do
 
   # Code at here will rollback when dry run.
 
-  if wet_run
+  # @wet will be true when -f option passed.
+  if @wet
     BatchManager.logger.info "Wet run completed!"
   else
     BatchManager.logger.warn "Rolling back."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batch_manager
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Weihu Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: daemon-spawn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +154,7 @@ files:
 - config/routes.rb
 - bin/bm_exec
 - lib/batch_manager/batch_status.rb
+- lib/batch_manager/daemon.rb
 - lib/batch_manager/engine.rb
 - lib/batch_manager/executor.rb
 - lib/batch_manager/logger.rb