bluth 0.6.7 → 0.6.8

data/CHANGES.txt

@@ -1,5 +1,11 @@
 BLUTH, CHANGES
 
+#### 0.6.8 (2011-02-07) ###############################
+
+* FIXED: Remove use of calls to fineround in Worker
+* CHANGE: Only call Familia.ld when in debug mode.
+
+
 #### 0.6.7 (2011-01-08) ###############################
 
 * FIXED: -f option now works for stop-workers and stop-scheduler commands

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :MAJOR: 0
 :MINOR: 6
-:PATCH: 7
+:PATCH: 8

data/bluth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bluth}
-  s.version = "0.6.7"
+  s.version = "0.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delano Mandelbaum"]
-  s.date = %q{2011-01-08}
+  s.date = %q{2011-02-08}
   s.default_executable = %q{bluth}
   s.description = %q{A Redis queuing system built on top of Familia}
   s.email = %q{delano@solutious.com}

data/lib/bluth.rb

@@ -140,7 +140,7 @@ module Bluth
       order << Bluth.queuetimeout  # We do it this way to support Ruby 1.8
       queue, gobid = *(Bluth::Queue.redis.send(meth, *order) || [])
       unless queue.nil?
-        Familia.ld "FOUND #{gobid} id #{queue}"
+        Familia.ld "FOUND #{gobid} id #{queue}" if Familia.debug?
         gob = Gob.from_redis gobid
         raise Bluth::Buster, "No such gob object: #{gobid}" if gob.nil?
         Bluth::Queue.running << gob.jobid
@@ -154,7 +154,7 @@ module Bluth
         Familia.info "ERROR (#{ex.message}): #{gobid} is an orphan"
         Bluth::Queue.orphaned << gobid
       end
-      Familia.ld ex.backtrace
+      Familia.ld ex.backtrace if Familia.debug?
     end
     gob
   end  
@@ -186,7 +186,7 @@ module Bluth
       gob.created
       gob.attempts = 0
       gob.save
-      Familia.ld "ENQUEUING: #{self} #{gob.jobid.short} to #{q}"
+      Familia.ld "ENQUEUING: #{self} #{gob.jobid.short} to #{q}" if Familia.debug?
       q << gob.jobid
       gob
     end
@@ -257,7 +257,7 @@ module Bluth
     end
     def perform
       @attempts += 1
-      Familia.ld "PERFORM: #{self.to_hash.inspect}"
+      Familia.ld "PERFORM: #{self.to_hash.inspect}" if Familia.debug?
       @stime = Time.now.utc.to_f
       save # update the time
       self.handler.prepare if self.class.respond_to?(:prepare)
@@ -291,7 +291,7 @@ module Bluth
       Bluth.queue(current_queue)
     end
     def dequeue!
-      Familia.ld "Deleting #{self.jobid} from #{queue.rediskey}"
+      Familia.ld "Deleting #{self.jobid} from #{queue.rediskey}" if Familia.debug?
       queue.remove 0, self.jobid
     end
     def running!
@@ -303,7 +303,7 @@ module Bluth
       #  raise Bluth::Buster, "Cannot move job to the queue it's in: #{to}"
       #end
       from, to = Bluth.queue(current_queue), Bluth.queue(to)
-      Familia.ld "Moving #{self.jobid} from #{from.rediskey} to #{to.rediskey}"
+      Familia.ld "Moving #{self.jobid} from #{from.rediskey} to #{to.rediskey}" if Familia.debug?
       @messages << msg unless msg.nil? || msg.empty?
       # We push first to make sure we never lose a Gob ID. Instead
       # there's the small chance of a job ID being in two queues. 

data/lib/bluth/worker.rb

@@ -171,7 +171,7 @@ module Bluth
         Familia.reconnect_all! # Need to reconnect after daemonize
         save
         scheduler.every Worker.interval, :blocking => true do |task|
-          Familia.ld "#{$$} TICK @ #{Time.now.utc}"
+          Familia.ld "#{$$} TICK @ #{Time.now.utc}" if Familia.debug?
           sleep rand
           find_gob task
         end
@@ -217,7 +217,7 @@ module Bluth
             tms = Benchmark.measure do
               job.perform
             end
-            job.cpu = [tms.utime.fineround(3),tms.stime.fineround(3),tms.real.fineround(3)]
+            job.cpu = [tms.utime,tms.stime,tms.real]
             job.save
             job.success!
             self.success!
@@ -303,7 +303,7 @@ module Bluth
           ScheduleWorker.schedule = Rufus::Scheduler::EmScheduler.start_new
           self.class.every.each do |args|
             interval, opts, blk = *args
-            Familia.ld " scheduling every #{interval}: #{opts}"
+            Familia.ld " scheduling every #{interval}: #{opts}" if Familia.debug?
             ScheduleWorker.schedule.every interval, opts, &blk
           end
         }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bluth
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 6
-  - 7
-  version: 0.6.7
+  - 8
+  version: 0.6.8
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-08 00:00:00 -05:00
+date: 2011-02-08 00:00:00 -05:00
 default_executable: bluth
 dependencies: 
 - !ruby/object:Gem::Dependency