simple_worker 1.0.13 → 1.0.14

data/lib/simple_worker/base.rb

@@ -45,7 +45,7 @@ module SimpleWorker
         reqs.each do |r|
           r2 = "#{gem_info[:path]}/lib/#{r}"
           begin
-            puts 'requiring ' + r2
+            SimpleWorker.logger.debug 'requiring ' + r2
             require r2
           rescue LoadError=>ex
             raise "Gem #{gem_name} was found, but we could not load the file '#{r2}'. You may need to use :require=>x.........."

data/lib/simple_worker/service.rb

@@ -168,6 +168,18 @@ sw_config = job_data['sw_config']
         f.write("require 'simple_worker'\n")
 
 
+        File.open(File.join(File.dirname(__FILE__), 'server', 'overrides.rb'), 'r') do |fr|
+          while line = fr.gets
+            f.write line
+          end
+        end
+
+        # Now we must disable queuing while loading up classes. This is from the overrides.rb file
+f.write("
+SimpleWorker.disable_queueing()
+")
+        
+
         # add some rails stuff if using Rails
         if defined?(Rails)
           f.write "module Rails
@@ -208,18 +220,13 @@ end
           f.write "init_mailer(sw_config)\n"
           f.write "ActionMailer::Base.prepend_view_path('templates')\n"
         end
-        f.write "init_database_connection(sw_config)"
+        f.write "init_database_connection(sw_config)\n"
         if SimpleWorker.config.extra_requires
           SimpleWorker.config.extra_requires.each do |r|
             f.write "require '#{r}'\n"
           end
         end
 
-        File.open(File.join(File.dirname(__FILE__), 'server', 'overrides.rb'), 'r') do |fr|
-          while line = fr.gets
-            f.write line
-          end
-        end
 
         merged.each_pair do |k, v|
           if v[:extname] == ".rb"
@@ -231,16 +238,17 @@ end
         end
         #end
         #f.write File.open(filename, 'r') { |mo| mo.read }
-        f.write("require_relative '#{File.basename(filename)}'")
+        f.write("require_relative '#{File.basename(filename)}'\n")
 
 
 
         f.write("
-  SimpleWorker.disable_queueing()
   runner_class = get_class_to_run(job_data['class_name'])
   SimpleWorker.running_class = runner_class
   runner = init_runner(runner_class, job_data, dirname)
   init_worker_service_for_runner(job_data)
+
+  # lastly, reenable queueing
   SimpleWorker.enable_queueing()
 
 # Let's run it!

metadata

@@ -2,7 +2,7 @@
 name: simple_worker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors: 
 - Travis Reeder
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-26 00:00:00 Z
+date: 2011-11-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zip