simple_worker 1.0.10 → 1.0.11

data/README.markdown

@@ -263,6 +263,23 @@ You could easily merge mailers you're using in your application.
 
 if you already set auto_merge=true all your mailers already merged.
 
+Configuring a Mailer Connection
+
+If you are using Rails 3,your action_mailer connection would be configured automatically from your config
+
+For non Rails 3 or if you want to use different mailer configs, you should add the following to your SimpleWorker config:
+
+    config.mailer = {
+        :address => "smtp.gmail.com",
+        :port => 587,
+        :domain => 'gmail.com',
+        :user_name => GMAIL_USERNAME
+        :password => GMAIL_PASSWORD
+        :authentication => 'plain',
+        :enable_starttls_auto => true}
+
+Then before you job is run, SimpleWorker will establish the ActionMailer connection.
+
 Merging Gems
 ---------------------
 
@@ -280,6 +297,18 @@ This allows you to use any gem you'd like with SimpleWorker. This uses the same
 
 [Check here for more info on merge_gem](http://support.simpleworker.com/kb/working-with-simpleworker/merging-gems-into-your-worker).
 
+
+Job Timeout
+--------------
+
+By default, each job has 60 minutes (3600 seconds to complete). If you know that your job should take less than that, you can specify a timeout explicitly:
+
+    worker.queue(:timeout=>1800)
+
+This will kill your job if it is running more than 1800 seconds, or half an hour.
+
+
+
 Global Merging
 --------------
 

data/lib/simple_worker/base.rb

@@ -151,6 +151,7 @@ module SimpleWorker
       # puts 'run_local'
       set_auto_attributes
       init_database
+	  init_mailer
       begin
         run
       rescue => ex
@@ -162,6 +163,14 @@ module SimpleWorker
       end
     end
 
+	def init_mailer
+      if SimpleWorker.config.mailer
+        require 'action_mailer'
+         ActionMailer::Base.raise_delivery_errors = true
+         ActionMailer::Base.smtp_settings = (SimpleWorker.config.mailer)
+      end
+    end
+
     def init_database
       if SimpleWorker.config.database
         require 'active_record'

data/lib/simple_worker/config.rb

@@ -18,6 +18,7 @@ module SimpleWorker
                   :mailers,
                   #:gems, # todo: move anything that uses this to merged_gems
                   :database,
+                  :mailer,
                   :extra_requires,
                   #:auto_merge,
                   :server_gems,
@@ -70,6 +71,10 @@ module SimpleWorker
           else
             #puts 'NOT DOING ACTIVERECORD'
           end
+
+          if defined?(ActionMailer) && ActionMailer::Base.smtp_settings
+            c2.mailer = ActionMailer::Base.smtp_settings
+          end
           c2.merged_gems.merge!(get_required_gems) if defined?(Bundler)
           SimpleWorker.logger.debug "MODELS " + c2.models.inspect
           SimpleWorker.logger.debug "MAILERS " + c2.mailers.inspect
@@ -146,6 +151,7 @@ module SimpleWorker
       config_data['access_key'] = access_key
       config_data['secret_key'] = secret_key
       config_data['database'] = self.database if self.database
+      config_data['mailer'] = self.mailer if self.mailer
       config_data['global_attributes'] = self.global_attributes if self.global_attributes
       config_data['host'] = self.host if self.host
       config_data

data/lib/simple_worker/server/runner.rb

@@ -12,6 +12,18 @@ def init_database_connection(sw_config)
   end
 end
 
+def init_mailer(sw_config)
+  if sw_config
+    mailer_config = sw_config['mailer']
+    if mailer_config
+      require 'action_mailer'
+       ActionMailer::Base.raise_delivery_errors = true
+       ActionMailer::Base.smtp_settings =  mailer_config
+       ActionMailer::Base.delivery_method = :smtp
+    end
+  end
+end
+
 def get_class_to_run(class_name)
   runner_class = constantize(class_name)
   return runner_class
@@ -57,6 +69,10 @@ def init_worker_service_for_runner(job_data)
     if db_config
       config.database = db_config
     end
+    mailer_config = sw_config['mailer']
+    if mailer_config && config.respond_to?(:mailer)
+      config.mailer = mailer_config
+    end
     config.global_attributes = sw_config['global_attributes'] if sw_config['global_attributes']
   end
 end
@@ -69,8 +85,8 @@ job_data.merge!(run_data)
 puts 'job_data=' + job_data.inspect
 
 sw_config = job_data['sw_config']
-begin
   init_database_connection(sw_config)
+  init_mailer(sw_config)
   SimpleWorker.disable_queueing()
   runner_class = get_class_to_run(job_data['class_name'])
   SimpleWorker.running_class = runner_class
@@ -79,8 +95,4 @@ begin
   SimpleWorker.enable_queueing()
 
 # Let's run it!
-  runner_return_data = runner.run
-rescue Exception => ex
-  $stderr.puts "_error_from_sw_"
-  raise ex
-end
+  runner_return_data = runner.run

data/lib/simple_worker/service.rb

@@ -122,10 +122,10 @@ module SimpleWorker
       #tmp_file = File.join(Dir.tmpdir(), File.basename(filename))
       tmp_file = File.join(Dir.tmpdir(), 'runner.rb')
       File.open(tmp_file, "w") do |f|
-
+        f.write("begin\n")#error handling block start
         f.write("
 # Find environment (-e)
-dirname = " "
+dirname = ''
 i = 0
 job_data_file = run_data_file = nil
 puts \"args for single file=\" + ARGV.inspect
@@ -226,7 +226,12 @@ end
             f.write line
           end
         end
-
+        #error handling block - end
+        f.write("\nrescue Exception => ex
+                $stderr.puts '_error_from_sw_'
+                 raise ex
+                end
+                ")
 
       end
       #puts 'funner.rb=' + tmp_file

metadata

@@ -2,7 +2,7 @@
 name: simple_worker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors: 
 - Travis Reeder
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 Z
+date: 2011-09-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zip