bj 0.0.4 → 0.0.5

data/HISTORY

@@ -1,3 +1,21 @@
+0.0.5:
+  - use full path to ruby for plugin mode
+  - plugin correctly installs bin -->> script
+  - plugin install uses --force
+  - properly quote paths in windows (spaces)
+  - swith win signal to ABRT (was INT)
+  - background job regrestration now uses ppid to pin the subprocess to a
+    parent
+  - use ppid to detect parent death and exit in event loop 
+  - don't use gem dependanices in plugin as they are broken when loading from
+    muliple gem repos
+  - added a small amount of drb magic that allows signals to work across
+    processes even on windows (see http://drawohara.com/post/22540307)
+  
+0.0.4:
+  - basic functionality in widows
+  - several small bug fixes
+
 0.0.3:
   - *many* small bug fixes
 

data/TODO

@@ -1,6 +1,9 @@
 
-- signals not operating properly on windows , non critical error tho...
+? the whole gem_path thing is still fubar
+
+? commands need quoting, esp for windows, "c:\Documents And..." etc
 
+- signals not operating properly on windows , non critical error tho...
 
 - need to figure out how to cache connections for Bj.in(...)
 
@@ -23,8 +26,6 @@
 
 ================================================================================
 
-X the whole gem_path thing is still fubar
-X commands need quoting, esp for windows, "c:\Documents And..." etc
 X ./script/console submission hangs on windows
 X default PATH setting
 X install issues for dave? - gem_path...

data/lib/bj.rb

@@ -30,6 +30,7 @@ unless defined? Bj
     require "rbconfig"
     require "set"
     require "erb"
+    require "drb"
   #
   # bootstrap rubygems 
   #

data/lib/bj/api.rb

@@ -153,7 +153,7 @@ class Bj
     def plugin options = {}
       options.to_options!
       chroot do
-        util.spawn "./script/plugin install http://codeforpeople.rubyforge.org/svn/rails/plugins/bj", options
+        util.spawn "#{ Bj.ruby } ./script/plugin install http://codeforpeople.rubyforge.org/svn/rails/plugins/bj --force", options
       end
     end
   end

data/lib/bj/runner.rb

@@ -19,6 +19,11 @@ class Bj
         }.inspect
       end
 
+
+# TODO - this should try to use drb too
+# TODO - pull out win stuff using platform.rb
+# TODO - auto start runner?
+
       def new_thread 
         this = self
         Thread.new do
@@ -30,7 +35,7 @@ class Bj
               this.pid = pid = pipe.pid
               cleanup = lambda do
                 cleanup = lambda{}
-                begin; Process.kill('SIGTERM', pid); rescue Exception; 42; end
+                begin; Process.kill(Runner.kill_signal, pid); rescue Exception; 42; end
               end
               at_exit &cleanup
               Process.wait
@@ -49,8 +54,10 @@ class Bj
 
     module ClassMethods
       attribute("thread"){ Thread.current }
-      attribute("signal"){ Signal.list.keys.index("HUP") ? "HUP" : "INT" }
-      attribute("signaled"){ true }
+      attribute("hup_signal"){ Signal.list.keys.index("HUP") ? "HUP" : "ABRT" }
+      attribute("hup_signaled"){ false }
+      attribute("kill_signal"){ "TERM" }
+      attribute("kill_signaled"){ false }
 
       def tickle
         return nil if Bj.config[Runner.no_tickle_key]
@@ -58,19 +65,27 @@ class Bj
       end
 
       def ping
-        pid = Bj.config[Runner.key]
+        pid = nil
+        uri = nil
+        process = nil
+        Bj.transaction do
+          pid = Bj.config[Runner.key(Process.pid)] || Bj.config[Runner.key]
+          uri = Bj.config["#{ pid }.uri"]
+          process = uri ? DRbObject.new(nil, uri) : Process
+        end
         return nil unless pid
         pid = Integer pid
         begin
-          Process.kill Runner.signal, pid
+          process.kill Runner.hup_signal, pid
           pid
         rescue Exception 
           false
         end
       end
 
-      def key
-        "#{ Bj.rails_env }.pid"
+      def key ppid = 0
+        ppid ||= 0
+        "#{ Bj.rails_env }.#{ ppid }.pid"
       end
 
       def no_tickle_key 
@@ -92,14 +107,15 @@ class Bj
       end
 
       def command
-        %W[
-          #{ Bj.ruby } #{ Bj.script } run 
+        "#{ Bj.ruby } " + %W[
+          #{ Bj.script }
+          run 
           --forever 
           --redirect=#{ log }
           --ppid=#{ Process.pid }
           --rails_env=#{ Bj.rails_env }
           --rails_root=#{ Bj.rails_root }
-        ].join(" ")
+        ].map{|word| word.inspect}.join(" ")
       end
 
       def log
@@ -205,13 +221,15 @@ class Bj
             end
           end
 
-          Runner.signaled false
+          Runner.hup_signaled false
           wait.times do
+            break if Runner.hup_signaled?
+            break if Runner.kill_signaled?
             sleep 1
-            break if Runner.signaled?
           end 
 
           break unless(limit or limit == false)
+          break if Runner.kill_signaled?
         end
       end
 
@@ -228,21 +246,38 @@ class Bj
       end
 
       def install_signal_handlers
-        trap(Runner.signal) do
-          begin
-            Runner.signaled!
-          rescue Exception => e
-            Bj.logger.error{ e } 
+        Runner.hup_signaled false
+        hup_handler = nil
+        hup_handler =
+          trap Runner.hup_signal do |*a|
+            begin
+              Runner.hup_signaled true
+            rescue Exception => e
+              Bj.logger.error{ e } rescue nil
+            end
+            hup_handler.call *a rescue nil
           end
-        end
 
-        trap("INT"){ exit } unless Runner.signal == "INT"
-      rescue Exception
-        42
+        Runner.kill_signaled false
+        kill_handler = nil
+        kill_handler =
+          trap Runner.kill_signal do |*a|
+            begin
+              Runner.kill_signaled true
+            rescue Exception => e
+              Bj.logger.error{ e } rescue nil
+            end
+            kill_handler.call *a rescue nil
+          end
+
+        begin
+          trap("INT"){ exit }
+        rescue Exception
+        end
       end
 
-      def fill_morgue options = {}
-        Bj.transaction(options) do
+      def fill_morgue
+        Bj.transaction do
           now = Time.now
           jobs = Bj::Table::Job.find :all,
                                      :conditions => ["state = 'running' and runner = ?", Bj.hostname]
@@ -263,8 +298,8 @@ class Bj
         end
       end
 
-      def archive_jobs options = {}
-        Bj.transaction(options) do
+      def archive_jobs
+        Bj.transaction do
           now = Time.now
           too_old = now - Bj.ttl
           jobs = Bj::Table::Job.find :all,
@@ -278,11 +313,13 @@ class Bj
         end
       end
 
-      def register options = {}
-        Bj.transaction(options) do
-          pid = Bj.config[Runner.key]
+      def register
+        Bj.transaction do
+          pid = Bj.config[key]
           return false if Util.alive?(pid)
-          Bj.config[Runner.key] = Process.pid
+          Bj.config[key] = Process.pid
+          DRb.start_service "druby://localhost:0", Process
+          Bj.config["#{ Process.pid }.uri"] = DRb.uri 
         end
         at_exit{ unregister }
         true
@@ -290,14 +327,18 @@ class Bj
         false
       end
 
-      def unregister options = {}
-        Bj.transaction(options) do
-          Bj.config.delete Runner.key
+      def unregister
+        Bj.transaction do
+          Bj.config.delete key
         end
         true
       rescue Exception
         false
       end
+
+      def key
+        @key ||= ( options[:ppid] ? Runner.key(options[:ppid]) : Runner.key )
+      end
     end
     send :include, Instance_Methods
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: bj
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
-date: 2007-12-23 00:00:00 -07:00
+  version: 0.0.5
+date: 2007-12-28 00:00:00 -07:00
 summary: bj
 require_paths: 
 - lib