beanworker 0.0.3 → 0.0.4

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.0.4 2011-10-24
+
+* 1 minor enhancement:
+  * moar logging
+
 === 0.0.3 2011-10-24
 
 * 1 major enhancement:

data/README.rdoc

@@ -5,6 +5,7 @@
 == DESCRIPTION:
 
 It is a worker-side Beanstalk-based job-queueing dispatcher
+
 This is a pre-release, I will complete tests and docs in couple days
 
 == REQUIREMENTS:
@@ -17,7 +18,9 @@ beanstalk-client
     $ beanworker <jobs.rb> <host:port|path/to/file.yml> [-d|--daemonize [-m|--monitor] [-P|--pid <path/to/pid/dir>] ]
 
 -d|--daemonize - process will go in background
+
 -m|--monitor   - process will be started with monitor, that will restart it when it crushes
+
 -P|--pid       - path to the directory, where pid-file(s) will be saved, default is current directory
 
 == DSL
@@ -58,7 +61,16 @@ jobs.rb:
 
 == API:
 
-TODO
+RDoc will be later
+
+Beanworker::Worker.perform number_of_threads, *jobs_names_to_listen
+
+Beanworker::Worker.schedule method_name, period_to_run_in_secs, options={}, *args_to_method
+
+options are:
+ - at: if period is in days (p % 1.day == 0), job will be performed exact at this time
+ - timeout: job will be killed if it performs more than this time in secs
+
 
 == INSTALL:
 

data/bin/beanworker

@@ -3,6 +3,8 @@ if ARGV[0] == '-h' || ARGV[0] == '--help'
   abort 'beanworker <jobs.rb> <host:port|path/to/file.yml> [-d|--daemonize] [-m|--monitor] [-P|--pid <path/to/pid/dir>]'
 end
 
+require File.expand_path('../../lib/beanworker', __FILE__)
+
 if ARGV[0] == '-v' || ARGV[0] == '--version'
   abort Beanworker::VERSION
 end
@@ -22,6 +24,4 @@ trap('INT') do
   exit
 end
 
-
-require File.expand_path('../../lib/beanworker', __FILE__)
 Beanworker.run opts

data/lib/beanworker/worker.rb

@@ -10,7 +10,7 @@ module Beanworker
         Thread.new do
           connection = Beanqueue.connect Beanworker.connection_config
           tubes.each { |tube| connection.watch(tube.to_s.gsub('_', '.')) }
-          logger.info("Listening: #{tubes.inspect}") if logger
+          logger.info "Listening: #{tubes.inspect}"
           loop do
             get_one_job connection
           end
@@ -47,11 +47,12 @@ module Beanworker
     rescue SystemExit
       raise
     rescue => e
-      logger.error(e.backtrace.unshift(e.message)) if logger
+      logger.error e.backtrace.unshift(e.message)
       job.bury rescue nil
     end
 
     def work_job(name, ttr, args, need_fork=false)
+      logger.info "Starting #{name} with #{args.inspect}"
       if need_fork
         Process.wait(Process.fork do
           work_with_timeout(name, ttr, args)
@@ -59,6 +60,7 @@ module Beanworker
       else
         work_with_timeout(name, ttr, args)
       end
+      logger.info "Finished #{name} with #{args.inspect}"
     end
 
     def work_with_timeout(name, ttr, args)

data/lib/beanworker.rb

@@ -1,10 +1,11 @@
 #coding: utf-8
 require 'daemons'
 require 'beanqueue'
+require 'logger'
 require File.dirname(__FILE__) + '/beanworker/worker'
 
 module Beanworker
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 
   class << self
     attr_accessor :connection_config
@@ -20,7 +21,7 @@ module Beanworker
       end
     end
 
-    def run_loop(opts)
+    def run_loop(opts={})
       require opts[:jobs_file]
       loop { gets } unless opts[:no_wait]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beanworker
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &7708700 !ruby/object:Gem::Requirement
+  requirement: &22123460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7708700
+  version_requirements: *22123460
 - !ruby/object:Gem::Dependency
   name: beanqueue
-  requirement: &7705900 !ruby/object:Gem::Requirement
+  requirement: &22122860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *7705900
+  version_requirements: *22122860
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &7704520 !ruby/object:Gem::Requirement
+  requirement: &22095800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,9 +43,10 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *7704520
+  version_requirements: *22095800
 description: ! 'It is a worker-side Beanstalk-based job-queueing dispatcher
 
+
   This is a pre-release, I will complete tests and docs in couple days'
 email:
 - gearhead@it-primorye.ru
@@ -90,7 +91,7 @@ rubyforge_project: beanworker
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: It is a worker-side Beanstalk-based job-queueing dispatcher This is a pre-release,
+summary: It is a worker-side Beanstalk-based job-queueing dispatcher  This is a pre-release,
   I will complete tests and docs in couple days
 test_files:
 - test/test_beanworker.rb