rsched 0.3.1 → 0.3.2

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2011-07-23 version 0.3.2
+
+* Added --env K=V option
+* Accepts multiple -f, --file option
+
+
 == 2011-07-20 version 0.3.1
 
 * Run task exactly at XX:XX:00

data/README.rdoc

@@ -45,18 +45,23 @@ _Example:_
           --exec COMMAND               Execute command
           --run SCRIPT.rb              Run method named 'run' defined in the script
       -a, --add EXPR                   Add an execution schedule
-      -t, --timeout SEC                Retry timeout (default: 600)
+      -t, --timeout SEC                Retry timeout (default: 30)
       -r, --resume SEC                 Limit time to resume tasks (default: 3600)
       -E, --delete SEC                 Limit time to delete tasks (default: 2592000)
       -n, --name NAME                  Unique name of this node (default: PID.HOSTNAME)
       -w, --delay SEC                  Delay time before running a task (default: 0)
-      -F, --from UNIX_TIME_OR_now      Time to start scheduling
+      -F, --from YYYY-mm-dd_OR_now     Time to start scheduling
+      -e, --extend-timeout SEC         Threashold time before extending visibility timeout (default: timeout * 3/4)
+      -x, --kill-timeout SEC           Threashold time before killing process (default: timeout * 10)
+      -X, --kill-retry SEC             Threashold time before retrying killing process (default: 60)
       -i, --interval SEC               Scheduling interval (default: 10)
+      -U, --release-on-fail            Releases lock if task failed so that other node can retry immediately
       -T, --type TYPE                  Lock database type (default: mysql)
       -D, --database DB                Database name
       -H, --host HOST[:PORT]           Database host
       -u, --user NAME                  Database user name
       -p, --password PASSWORD          Database password
+          --env K=V                    Set environment variable
       -d, --daemon PIDFILE             Daemonize (default: foreground)
       -f, --file PATH.yaml             Read configuration file
 

data/lib/rsched/command/rsched.rb

@@ -15,7 +15,7 @@ defaults = {
   :delay => 0,
   :interval => 10,
   :type => 'mysql',
-  :name => "#{Process.pid}.#{`hostname`.strip}",
+  :node_name => "#{Process.pid}.#{`hostname`.strip}",
   :kill_retry => 60,
   :release_on_fail => false,
 }
@@ -51,7 +51,7 @@ op.on('-E', '--delete SEC', 'Limit time to delete tasks (default: 2592000)', Int
 }
 
 op.on('-n', '--name NAME', 'Unique name of this node (default: PID.HOSTNAME)') {|s|
-  conf[:name] = s
+  conf[:node_name] = s
 }
 
 op.on('-w', '--delay SEC', 'Delay time before running a task (default: 0)', Integer) {|i|
@@ -82,12 +82,12 @@ op.on('-i', '--interval SEC', 'Scheduling interval (default: 10)', Integer) {|i|
   conf[:interval] = i
 }
 
-op.on('-E', '--release-on-fail', 'Releases lock if task failed so that other node can retry immediately', TrueClass) {|b|
+op.on('-U', '--release-on-fail', 'Releases lock if task failed so that other node can retry immediately', TrueClass) {|b|
   conf[:release_on_fail] = b
 }
 
 op.on('-T', '--type TYPE', 'Lock database type (default: mysql)') {|s|
-  conf[:type] = s
+  conf[:db_type] = s
 }
 
 op.on('-D', '--database DB', 'Database name') {|s|
@@ -106,12 +106,17 @@ op.on('-p', '--password PASSWORD', 'Database password') {|s|
   conf[:db_password] = s
 }
 
+op.on('--env K=V', 'Set environment variable') {|s|
+  k, v = s.split('=',2)
+  (conf[:env] ||= {})[k] = v
+}
+
 op.on('-d', '--daemon PIDFILE', 'Daemonize (default: foreground)') {|s|
   conf[:daemon] = s
 }
 
 op.on('-f', '--file PATH.yaml', 'Read configuration file') {|s|
-  conf[:file] = s
+  (conf[:files] ||= []) << s
 }
 
 
@@ -137,11 +142,16 @@ begin
     usage nil
   end
 
-  if conf[:file]
+  if conf[:files]
     require 'yaml'
-    yaml = YAML.load File.read(conf[:file])
+    docs = ''
+    conf[:files].each {|file|
+      docs << File.read(file)
+    }
     y = {}
-    yaml.each_pair {|k,v| y[k.to_sym] = v }
+    YAML.load_documents(docs) {|yaml|
+      yaml.each_pair {|k,v| y[k.to_sym] = v }
+    }
 
     conf = defaults.merge(y).merge(conf)
 
@@ -174,7 +184,7 @@ begin
     raise "delete time (-E) must be larger than resume time (-r)"
   end
 
-  case conf[:type]
+  case conf[:db_type]
   when 'mysql'
     if !conf[:db_database] || !conf[:db_host] || !conf[:db_user]
       raise "--database, --host and --user are required for mysql"
@@ -188,7 +198,7 @@ begin
     dbi = "DBI:SQLite3:#{conf[:db_database]}"
 
   else
-    raise "Unknown lock server type '#{conf[:type]}'"
+    raise "Unknown lock server type '#{conf[:db_type]}'"
   end
 
   unless conf[:extend_timeout]
@@ -207,7 +217,7 @@ end
 if confout
   require 'yaml'
 
-  conf.delete(:file)
+  conf.delete(:files)
   conf[:schedule] = schedule
   conf[:args] = ARGV
 
@@ -226,7 +236,7 @@ if schedule.empty?
 end
 
 
-puts "Using node name #{conf[:name]}"
+puts "Using node name #{conf[:node_name]}"
 
 
 if conf[:daemon]
@@ -244,7 +254,7 @@ end
 
 
 begin
-  lock = RSched::DBLock.new(conf[:name], conf[:timeout], dbi, conf[:db_user].to_s, conf[:db_password].to_s)
+  lock = RSched::DBLock.new(conf[:node_name], conf[:timeout], dbi, conf[:db_user].to_s, conf[:db_password].to_s)
 rescue DBI::InterfaceError
   STDERR.puts "Can't initialize DBI interface: #{$!}"
   STDERR.puts "You may have to install database driver first:"

data/lib/rsched/engine.rb

@@ -56,6 +56,7 @@ class Engine
     @kill_retry = conf[:kill_retry]
     @sched_start = conf[:from] || 0
     @release_on_fail = conf[:release_on_fail]
+    @env = conf[:env] || {}
     @finished = false
     @ss = {}
 
@@ -146,6 +147,10 @@ class Engine
   def process(token, ident, time, action)
     puts "started token=#{token.inspect} time=#{time}"
 
+    @env.each_pair {|k,v|
+      ENV[k] = v
+    }
+
     @extender.set_token(token)
 
     success = false

data/lib/rsched/version.rb

@@ -1,5 +1,5 @@
 module RSched
 
-VERSION = '0.3.1'
+VERSION = '0.3.2'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rsched
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Sadayuki Furuhashi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-20 00:00:00 +09:00
+date: 2011-07-23 00:00:00 +09:00
 default_executable: rsched
 dependencies: 
 - !ruby/object:Gem::Dependency