refinery 0.10.6 → 0.10.8

data/.gitignore

@@ -2,4 +2,5 @@ logs/*.log
 config/config.yml
 rdoc/*
 refinery-*.gem
-stats.db
+stats.db
+*.pid

data/VERSION

@@ -1 +1 @@
-0.10.6
+0.10.8

data/bin/epub

@@ -27,13 +27,16 @@ require 'getoptlong'
 require 'rdoc/usage'
 require File.dirname(__FILE__) + '/../lib/refinery'
 
+pidfile = 'epub.pid'
+
 options = {}
 opts = GetoptLong.new(
   [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
   [ '--debug', '-d', GetoptLong::NO_ARGUMENT ],
   [ '--config', '-c', GetoptLong::REQUIRED_ARGUMENT],
   [ '--publishers', '-p', GetoptLong::REQUIRED_ARGUMENT],
-  [ '--verbose', '-v', GetoptLong::NO_ARGUMENT]
+  [ '--verbose', '-v', GetoptLong::NO_ARGUMENT],
+  [ '--pidfile', GetoptLong::REQUIRED_ARGUMENT]
 )
 opts.each do |opt, arg|
   case opt
@@ -47,7 +50,15 @@ opts.each do |opt, arg|
     options[:publishers] = arg
   when '--verbose'
     options[:verbose] = true
+  when '--pidfile'
+    pidfile = arg
   end
 end
 
-Refinery::EventPublisher.new(options).run
+open(pidfile, 'w') do |f|
+  f << $$
+end
+
+Refinery::EventPublisher.new(options).run
+
+File.delete(pidfile)

data/bin/refinery

@@ -27,13 +27,16 @@ require 'getoptlong'
 require 'rdoc/usage'
 require File.dirname(__FILE__) + '/../lib/refinery'
 
+pidfile = 'refinery.pid'
+
 options = {}
 opts = GetoptLong.new(
   [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
   [ '--debug', '-d', GetoptLong::NO_ARGUMENT ],
   [ '--config', '-c', GetoptLong::REQUIRED_ARGUMENT],
   [ '--workers', '-w', GetoptLong::REQUIRED_ARGUMENT],
-  [ '--verbose', '-v', GetoptLong::NO_ARGUMENT]
+  [ '--verbose', '-v', GetoptLong::NO_ARGUMENT],
+  [ '--pidfile', GetoptLong::REQUIRED_ARGUMENT]
 )
 opts.each do |opt, arg|
   case opt
@@ -47,7 +50,15 @@ opts.each do |opt, arg|
     options[:workers] = arg
   when '--verbose'
     options[:verbose] = true
+  when '--pidfile'
+    pidfile = arg
   end
 end
 
-Refinery::Server.new(options).run
+open(pidfile, 'w') do |f|
+  f << $$
+end
+
+Refinery::Server.new(options).run
+
+File.delete(pidfile)

data/lib/refinery/daemon.rb

@@ -73,6 +73,13 @@ module Refinery #:nodoc:
     private
     def execute
       logger.debug "Running daemon thread: #{name} (settings: #{settings.inspect})"
+      
+      begin
+        require 'java'
+        java.lang.Thread.current_thread.name = "#{name} Daemon"
+      rescue LoadError => e
+      end
+      
       while(running?)
         #logger.debug "Checking #{queue_name}_waiting"
         with_queue("#{queue_name}_waiting") do |waiting_queue|

data/lib/refinery/heartbeat.rb

@@ -11,6 +11,12 @@ module Refinery #:nodoc:
       queue_prefix = config['prefix'] || ''
       @server = server
       @thread = Thread.new do
+        begin
+          require 'java'
+          java.lang.Thread.current_thread.name = 'Heartbeat'
+        rescue Exception => e
+        end
+        
         loop do
           with_queue("#{queue_prefix}heartbeat") do |heartbeat_queue|
             logger.debug "Send heartbeat"

data/lib/refinery/processor.rb

@@ -26,6 +26,12 @@ module Refinery #:nodoc:
     def execute
       queue_prefix = config['prefix'] || ''
       
+      begin
+        require 'java'
+        java.lang.Thread.current_thread.name = "#{key} Processor"
+      rescue Exception => e
+      end
+      
       logger.debug "Creating daemons for #{key}"
       1.upto(settings['workers']['initial']) do
         daemons << Daemon.new(self, key, queue_prefix, settings)

data/refinery.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{refinery}
-  s.version = "0.10.6"
+  s.version = "0.10.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anthony Eden"]
-  s.date = %q{2009-07-24}
+  s.date = %q{2009-08-11}
   s.description = %q{Process data in a distributed fashion.}
   s.email = %q{anthonyeden@gmail.com}
   s.executables = ["epub", "monitor", "pubnow", "refinery"]

data/test/unit/daemon_test.rb

@@ -9,6 +9,7 @@ class DaemonTest < Test::Unit::TestCase
       @error_queue = stub('Queue(error)')
       @done_queue = stub('Queue(done)')
       
+      Refinery::Daemon.any_instance.stubs(:require).with('java').raises(LoadError)
       Refinery::Daemon.any_instance.stubs(:queue).with(
       'sample_waiting').returns(@waiting_queue)
       Refinery::Daemon.any_instance.stubs(:queue).with(

data/test/unit/processor_test.rb

@@ -13,6 +13,7 @@ class ProcessorTest < Test::Unit::TestCase
       @error_queue = stub('Queue(error)')
       @done_queue = stub('Queue(done)')
       
+      Refinery::Daemon.any_instance.stubs(:require).with('java').raises(LoadError)
       Refinery::Daemon.any_instance.stubs(:queue).with(
       'sample_waiting').returns(@waiting_queue)
       Refinery::Daemon.any_instance.stubs(:queue).with(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinery
 version: !ruby/object:Gem::Version 
-  version: 0.10.6
+  version: 0.10.8
 platform: ruby
 authors: 
 - Anthony Eden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-24 00:00:00 -10:00
+date: 2009-08-11 00:00:00 -10:00
 default_executable: 
 dependencies: []