aeden-refinery 0.10.5 → 0.10.6

data/VERSION

@@ -1 +1 @@
-0.10.5
+0.10.6

data/lib/refinery/heartbeat.rb

@@ -8,10 +8,11 @@ module Refinery #:nodoc:
     
     # Initialize the heartbeat for the given server.
     def initialize(server)
+      queue_prefix = config['prefix'] || ''
       @server = server
       @thread = Thread.new do
         loop do
-          with_queue('heartbeat') do |heartbeat_queue|
+          with_queue("#{queue_prefix}heartbeat") do |heartbeat_queue|
             logger.debug "Send heartbeat"
             message = {
               'host_info' => host_info,

data/lib/refinery/monitor.rb

@@ -17,6 +17,7 @@ module Refinery #:nodoc:
       logger.level = Logger::INFO if options[:verbose]
       logger.level = Logger::DEBUG if options[:debug]
       config.load_file(options[:config]) if options[:config]
+      @queue_prefix = config['prefix'] || ''
     end
     
     # Execute the monitor. The monitor will start one heartbeat 
@@ -48,12 +49,12 @@ module Refinery #:nodoc:
     end
     
     def run_heartbeat_monitor
-      logger.info "Starting heartbeat monitor"
-      Thread.new('heartbeat') do |heartbeat_queue_name|
+      logger.info "Starting #{@queue_prefix}heartbeat monitor"
+      Thread.new("#{@queue_prefix}heartbeat") do |heartbeat_queue_name|
         loop do
           with_queue(heartbeat_queue_name) do |heartbeat_queue|
             while (message = heartbeat_queue.receive)
-              logger.debug decode_message(message.body).inspect
+              logger.debug "#{heartbeat_queue.name}: #{decode_message(message.body).inspect}"
               message.delete()
             end
           end
@@ -65,15 +66,16 @@ module Refinery #:nodoc:
     def run_done_monitors
       config['processors'].collect do |key, settings|
         queue_name = settings['queue'] || key
-        done_queue_name = "#{queue_name}_done"
+        done_queue_name = "#{@queue_prefix}#{queue_name}_done"
         logger.debug "Starting monitor for queue #{done_queue_name}"
         Thread.new(done_queue_name) do |done_queue_name|
           loop do
             with_queue(done_queue_name) do |done_queue|
               while (message = done_queue.receive)
                 done_message = decode_message(message.body)
+                logger.debug "#{done_queue.name}: #{done_message.pretty_inspect}"
                 processed = decode_message(done_message['original'])
-                logger.info "Done: #{processed.inspect}"
+                logger.info "Done: #{queue_name} #{processed.inspect}"
                 message.delete()
                 statistics.record_done(done_message)
               end
@@ -87,15 +89,16 @@ module Refinery #:nodoc:
     def run_error_monitors
       config['processors'].collect do |key, settings|
         queue_name = settings['queue'] || key
-        error_queue_name = "#{queue_name}_error"
+        error_queue_name = "#{@queue_prefix}#{queue_name}_error"
         logger.info "Starting error monitor for queue #{error_queue_name}"
         Thread.new(error_queue_name) do |error_queue_name|
           loop do
-            with(error_queue_name) do |error_queue|
+            with_queue(error_queue_name) do |error_queue|
               while (message = error_queue.receive)
                 error_message = decode_message(message.body)
+                logger.debug "#{error_queue.name}: #{error_message.pretty_inspect}"
                 processed = decode_message(error_message['original'])
-                logger.info "Error: #{processed.inspect}"
+                logger.info "Error: #{queue_name} #{processed.inspect}"
                 message.delete()
                 statistics.record_error(error_message)
               end

data/lib/refinery/server.rb

@@ -79,7 +79,7 @@ module Refinery #:nodoc:
       @format ||= "%s, [%s#%d][%s] %5s -- %s: %s\n"
     end
     def call(severity, time, progname, msg)
-      format % [severity[0..0], format_datetime(time), $$, Thread.current.object_id.to_s, severity, progname, msg.to_s]
+      format % [severity[0..0], format_datetime(time.utc), $$, Thread.current.object_id.to_s, severity, progname, msg.to_s]
     end
     def format_datetime(time)
       time.strftime("%Y-%m-%dT%H:%M:%S.") << "%06d " % time.usec

data/lib/refinery/stats_server.rb

@@ -10,7 +10,7 @@ module Refinery #:nodoc:
         Ramaze::Log.loggers.clear # supress all Ramaze logging
         Ramaze.start              # start the Ramaze server on port 7000
       rescue NameError
-        self.logger.warn "Install Remaze to enable the stats server"
+        self.logger.warn "Install Ramaze to enable the stats server"
       end
     end
     

data/refinery.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{refinery}
-  s.version = "0.10.5"
+  s.version = "0.10.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anthony Eden"]
-  s.date = %q{2009-07-14}
+  s.date = %q{2009-07-23}
   s.description = %q{Process data in a distributed fashion.}
   s.email = %q{anthonyeden@gmail.com}
   s.executables = ["epub", "monitor", "pubnow", "refinery"]
@@ -71,12 +71,11 @@ Gem::Specification.new do |s|
      "workers/sample.rb",
      "workers/sleep.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/aeden/refinery}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{refinery}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Refinery processes data in a distributed environment.}
   s.test_files = [
     "test/test_helper.rb",
@@ -98,7 +97,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aeden-refinery
 version: !ruby/object:Gem::Version 
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors: 
 - Anthony Eden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-14 00:00:00 -07:00
+date: 2009-07-23 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -81,7 +81,7 @@ files:
 - workers/error.rb
 - workers/sample.rb
 - workers/sleep.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/aeden/refinery
 post_install_message: 
 rdoc_options: 
@@ -105,7 +105,7 @@ requirements: []
 rubyforge_project: refinery
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Refinery processes data in a distributed environment.
 test_files: 
 - test/test_helper.rb