opee 1.0.3 → 1.0.4

data/README.md

@@ -24,11 +24,9 @@ Give it a try. Any comments, thoughts, or suggestions are welcome.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.0.3
+### Release 1.0.4
 
- - Added periodic status output to info mode.
-
- - Set logger name.
+ - Fixed a bug in queue size reporting for the Queue class.
 
 # Plans and Notes
 

data/lib/opee/actor.rb

@@ -76,8 +76,8 @@ module Opee
               sleep(1.0)
             end
           rescue Exception => e
-            Env.rescue(e)
             @busy = false
+            Env.rescue(e)
           end
         end
       end

data/lib/opee/env.rb

@@ -206,16 +206,16 @@ module Opee
     # Waits for all Actors to complete processing. The method only returns
     # when all Actors indicate they are no longer busy.
     def self.wait_finish()
-      next_time = Time.now + 2.0
+      next_time = Time.now + 5.0
       @@finish_thread = Thread.current
       @@actors.each { |a| a.wakeup() }
       while busy?
         sleep(0.2) # actors should wake up when queue is empty
-        if Logger::INFO >= @@log.severity
+        if Logger::DEBUG >= @@log.severity
           now = Time.now
           if next_time <= now
             log_status()
-            next_time = now + 2.0
+            next_time = now + 5.0
           end
         end
       end

data/lib/opee/queue.rb

@@ -26,6 +26,13 @@ module Opee
       @workers.size
     end
 
+    # Returns the number of requests on all three request queues, the normal,
+    # priority, and idle queues as well as the work queue.
+    # @return [Fixnum] number of queued requests
+    def queue_count()
+      @work_queue.size + super()
+    end
+
     # Returns the true if any requests are queued, a request is being
     # processed, or if there are jobs waiting on the work request queue.
     # @return [true|false] true if busy, false otherwise

data/lib/opee/version.rb

@@ -1,5 +1,5 @@
 
 module Opee
   # Current version of the module. 
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opee
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies: []
 description: ! 'An experimental Object-base Parallel Evaluation Environment. '
 email: peter@ohler.com