zmq_jobs 0.0.1.alpha2 → 0.0.1.alpha3

data/lib/command.rb

@@ -20,9 +20,11 @@ module ZmqJobs
     def initialize(args)
       raise 'You can not create instance of abstract class' if self.class == Command
       @daemonize = false
+      @debug = false
       @monitor = false
       @execute_dir = Dir.pwd
-      @pid_dir = './tmp'
+      @log_dir = './log'
+      @pid_dir = './pids'
       @config_file = './config/zmq_jobs.yml'
       @options = read_config_file
       
@@ -57,6 +59,9 @@ module ZmqJobs
         opts.on('-d', '--daemonize', "Daemonize the #{type} process") do
           @daemonize = true
         end
+        opts.on('-D', '--debug', "Debug mode") do
+          @debug = true
+        end
         opts.on('-c CONFIG', '--config CONFIG', "Use config file, default: #{config_file}") do |config|
           @config_file = config
         end
@@ -73,6 +78,7 @@ module ZmqJobs
       Daemons.run_proc(
         daemon_name, 
         {
+          :dir => @pid_dir,
           :multiple => false,
           :dir_mode => :normal,
           :monitor => monitor,
@@ -80,6 +86,8 @@ module ZmqJobs
           :ontop => !daemonize
         }
       ) do
+        config['debug'] = true if @debug
+        ZmqJobs.logger = Logger.new(File.expand_path("#{@log_dir}/#{daemon_name}.log", execute_dir)) if daemonize
         daemon_class(daemon_name).new(config).start
       end
       true
@@ -134,10 +142,11 @@ module ZmqJobs
     
     protected
     def preload_worker_class classname
+      filename = ActiveSupport::Inflector.underscore(classname)
       worker_class_dir = File.expand_path(options['workers_dir'], execute_dir)
       Kernel.require(
-        "#{worker_class_dir}/#{ActiveSupport::Inflector.underscore(classname)}"
-      ) unless Kernel.const_defined?(classname)
+        "#{worker_class_dir}/#{filename}"
+      ) unless Kernel.const_defined?(classname) && !File.exists?("#{worker_class_dir}/#{filename}.rb")
     end
     
     def opts_parser
@@ -145,6 +154,9 @@ module ZmqJobs
         opts.on('-w', '--workers LIST', 'Workers which have to run.') do |workers|
           @workers = workers.split(',')
         end
+#        opts.on('-r REQUIRE_FILE', '--require REQUIRE_FILE', "Require this file before start daemon") do |require_file|
+#          @require = require_file
+#        end
       end
     end
     

data/lib/rails/railties.rb

@@ -0,0 +1,5 @@
+module ZmqJobs
+  class Railties < Rails::Railties
+    config.autoload_paths << Rails.root.join('app', 'workers')
+  end
+end

data/lib/zmq_jobs.rb

@@ -50,3 +50,5 @@ module ZmqJobs
 end
 
 require 'command'
+
+require 'rails/railties' if defined?(Rails)

data/lib/zmq_jobs/devices/broker.rb

@@ -3,6 +3,9 @@ module ZmqJobs
     protected
     def start_device
       @device = ZMQ::Device.new(ZMQ::FORWARDER, frontend.socket, backend.socket)
+    rescue => e
+      logger.warn format_exception_message(e)
+      raise e
     end
     
     def create_frontend

data/lib/zmq_jobs/devices/device.rb

@@ -61,5 +61,12 @@ module ZmqJobs
     def logger
       ::ZmqJobs.logger
     end
+    
+    def format_exception_message exception
+<<-MESSAGE
+Execution error: #{exception} - #{exception.message}
+  #{exception.backtrace[0..10].join("\n  ")}
+MESSAGE
+    end
   end
 end

data/lib/zmq_jobs/socket/base.rb

@@ -1,9 +1,9 @@
 module ZmqJobs
   module Socket
-    class Error < RuntimeError;end
+    Error = Class.new(StandardError)
     class Base
       attr_reader :socket, :options
-
+      
       def initialize options={}
         iothreads = options['iothreads'] ? options['iothreads'].to_i : 1
         @context = options.delete('context') || ZMQ::Context.create(iothreads)
@@ -12,58 +12,68 @@ module ZmqJobs
         @socket = @context.socket(ZMQ::PUB)
         @running = false
       end
-
+      
       def create_link url
       end
-
+      
       def connect
         urls.each{|url|assert(create_link(url))}
         @connected = true
         self
       end
-
+      
       def disconnect
         socket.close if connected?
         @connected = false
         self
       end
-
+      
       def run
         @running = true
         connect
-
+        
         loop do
-          yield socket
+          yield self
           break unless running?
         end
         
         self
       end
-
+      
       def stop
         @running = false
         disconnect
       end
-
+      
       def terminate
         @context.terminate if @context && @context.respond_to?(:terminate)
       end
-
+      
       def running?
         !!@running
       end
-
+      
       def connected?
         !!@connected
       end
-
+      
+      def send message
+        assert(socket.send_string(message))
+      end
+      
+      def recv
+        message = ''
+        rc = socket.recv_string(message, ZMQ::NOBLOCK)
+        return message if ZMQ::Util.resultcode_ok?(rc)
+      end
+      
       protected
       def assert(rc)
         raise Error.new(
           "Operation failed, errno [#{ZMQ::Util.errno}] description [#{ZMQ::Util.error_string}]"
         ) unless ZMQ::Util.resultcode_ok?(rc)
       end
-
+      
       def urls
         u = []
         hosts.each do |host|
@@ -73,15 +83,15 @@ module ZmqJobs
         end
         u
       end
-
+      
       def hosts
         options['hosts'].is_a?(Array) ? options['hosts'] : [options['hosts']]
       end
-
+      
       def ports
         options['ports'].is_a?(Array) ? options['ports'] : [options['ports']]
       end
-
+      
       def build_default_options
         {
           'linger' => 0,

data/lib/zmq_jobs/version.rb

@@ -1,3 +1,3 @@
 module ZmqJobs
-  VERSION = "0.0.1.alpha2"
+  VERSION = "0.0.1.alpha3"
 end

data/lib/zmq_jobs/worker/base.rb

@@ -1,6 +1,8 @@
 module ZmqJobs
   module Worker
     class Base
+      include ActiveSupport::Callbacks
+      define_callbacks :start, :stop, :execute
       attr_reader :options
       class << self
         def cmd args
@@ -18,32 +20,43 @@ module ZmqJobs
       end
       
       def initialize options={}
+        @debug = options.delete('debug') || false
         @options = options
       end
       
       def start
-        trap('TERM'){stop}
-        trap('INT'){stop}
+        trap('TERM'){stop;Process.exit}
+        trap('INT'){stop;Process.exit}
         logger.info "#{self.class} is starting ..."
+        logger.debug 'Debug mode' if debug?
         
-        subscriber.run do |socket|
-          message = ''
-          rc = socket.recv_string(message, ZMQ::NOBLOCK)
-          if ZMQ::Util.resultcode_ok?(rc)
-            #message = BSON.deserialize(bson)
-            execute_job message
+        run_callbacks :start do
+          subscriber.run do |socket|
+            message = socket.recv
+            execute_job message if message
+            sleep 1
           end
         end
       end
       
       def stop
-        logger.info "Exiting..." 
-        subscriber.stop
-        #subscriber.terminate
+        logger.info "Exiting..."
+        run_callbacks :stop do
+          subscriber.stop
+          #subscriber.terminate
+        end
       end
       
       def execute_job message
-        execute(message)
+        run_callbacks :execute do
+          time = Time.now
+          logger.debug 'Start execute message...' if debug?
+          execute(message)
+          logger.debug "Stop execute message...Duration: #{Time.now - time}sec." if debug?
+        end
+      rescue => e
+        logger.warn format_exception_message(e)
+        #raise e
       end
       
       def subscriber
@@ -53,6 +66,17 @@ module ZmqJobs
       def logger
         ::ZmqJobs.logger
       end
+      
+      def debug?
+        !!@debug
+      end
+      
+      def format_exception_message exception
+<<-MESSAGE
+Execution error: #{exception} - #{exception.message}
+  #{exception.backtrace[0..10].join("\n  ")}
+MESSAGE
+      end
     end
   end
 end 

data/spec/lib/worker/base_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper.rb'
 
 TestWorker = Class.new(ZmqJobs::Worker::Base)
-
+ZmqJobs.logger = Logger.new('/dev/null')
 describe ZmqJobs::Worker::Base do
   describe '.cmd' do
     before do
@@ -11,7 +11,6 @@ describe ZmqJobs::Worker::Base do
     
     subject{TestWorker.cmd(options)}
     
-    
     context 'without arguments' do
       let(:options){[]}
       let(:result_options){{}}
@@ -48,7 +47,17 @@ describe ZmqJobs::Worker::Base do
     end
   end
   
-  describe '.new' do
+  describe '.start' do
+    before do
+      subscriber = mock(:subscriber)
+      subscriber.should_receive(:run).and_yield(worker).and_return(true)
+      worker.stub(:subscriber => subscriber)
+      worker.stub(:recv => 'Message')
+      worker.should_receive(:execute).with('Message').and_return(true)
+    end
+    
+    let(:worker){TestWorker.new}
     
+    specify{worker.start.should be_true}
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: zmq_jobs
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.0.1.alpha2
+  version: 0.0.1.alpha3
 platform: ruby
 authors: 
 - Undr
@@ -10,11 +10,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-11 00:00:00 +07:00
+date: 2011-12-14 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -22,10 +23,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "2"
   type: :development
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: yard
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,10 +34,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.6.0
   type: :development
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: ruby-debug19
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,10 +45,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: bundler
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -55,10 +56,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :runtime
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,10 +67,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: ffi
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,10 +78,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: ffi-rzmq
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -88,10 +89,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -99,10 +100,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: daemons
+  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,7 +111,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id009
 description: ZeroMQ-based queue system for background job
 email: 
@@ -136,6 +136,7 @@ files:
 - examples/workers/default.rb
 - examples/workers/test_worker.rb
 - lib/command.rb
+- lib/rails/railties.rb
 - lib/zmq_jobs.rb
 - lib/zmq_jobs/devices/balancer.rb
 - lib/zmq_jobs/devices/broker.rb
@@ -163,9 +164,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2610017728678870612
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false