say_when 0.2.5 → 0.2.6

data/lib/say_when/storage/active_record/job.rb

@@ -21,23 +21,23 @@ module SayWhen
         before_create :set_defaults
 
         def self.acquire_next(no_later_than)
-         SayWhen::Storage::ActiveRecord::Job.transaction do
-            # select and lock the next job that needs executin' (status waiting, and after no_later_than)
-            next_job = find(:first,
-                            :lock       => true,
-                            :order      => 'next_fire_at ASC',
-                            :conditions => ['status = ? and ? >= next_fire_at', 
-                                            STATE_WAITING,
-                                            no_later_than.in_time_zone('UTC')])
-
-            # make sure there is a job ready to run
-            return nil if next_job.nil?
-      
-            # set status to acquired to take it out of rotation
-            next_job.update_attribute(:status, STATE_ACQUIRED)
-      
-            return next_job
+          @next_job = nil
+          hide_logging do
+            SayWhen::Storage::ActiveRecord::Job.transaction do
+              # select and lock the next job that needs executin' (status waiting, and after no_later_than)
+              @next_job = find(:first,
+                              :lock       => true,
+                              :order      => 'next_fire_at ASC',
+                              :conditions => ['status = ? and ? >= next_fire_at', 
+                                              STATE_WAITING,
+                                              no_later_than.in_time_zone('UTC')])
+
+              # set status to acquired to take it out of rotation
+              @next_job.update_attribute(:status, STATE_ACQUIRED) unless @next_job.nil?
+        
+            end
           end
+          @next_job
         end
 
         def set_defaults
@@ -79,6 +79,21 @@ module SayWhen
           execution.save!
           result
         end
+
+        protected
+
+        def self.hide_logging
+          old_logger = nil
+          begin
+            old_logger = ::ActiveRecord::Base.logger
+            ::ActiveRecord::Base.logger = nil
+
+            yield
+
+          ensure
+            ::ActiveRecord::Base.logger = old_logger
+          end
+        end
         
       end
     

data/lib/say_when/version.rb

@@ -1,3 +1,3 @@
 module SayWhen
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/say_when.rb

@@ -18,8 +18,11 @@ module SayWhen
   end
   
   def SayWhen.logger
-    unless defined?(@@logger)
-      @@logger = Rails.logger if defined?(Rails.logger) && Rails.logger
+    if !defined?(@@logger) || !@@logger
+      if defined?(Rails.logger) && Rails.logger
+        @@logger = Rails.logger
+      end
+      
       @@logger = Logger.new(STDOUT) unless defined?(@@logger)
     end
     @@logger

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: say_when
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Andrew Kuklewicz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-11 00:00:00 Z
+date: 2012-10-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activemessaging