mobilize-base 1.33 → 1.34

data/README.md

@@ -278,6 +278,9 @@ The Jobtracker sits on your Resque and does 2 things:
 
 Emails are sent using ActionMailer, through the owner Google Drive
 account.
+  * errors are sent to the owner of the job/stage as well as the admin group.
+  * errors not specific to a job/stage are sent to the admin group only, as
+    given in gdrive.yml
 
 To this end, it needs these parameters, for which there is a sample
 below and in the [lib/samples][git_samples] folder:
@@ -290,24 +293,18 @@ development:
   runner_read_freq: 300 #5 min between runner reads
   max_run_time: 14400 # if a job runs for 4h+, notification will be sent
   extensions: [] #additional Mobilize modules to load workers with
-  admins: #emails to send notifications to
-  - email: admin@host.com
 test:
   cycle_freq: 10 #time between Jobtracker sweeps
   notification_freq: 3600 #1 hour between failure/timeout notifications
   runner_read_freq: 300 #5 min between runner reads
   max_run_time: 14400 # if a job runs for 4h+, notification will be sent
   extensions: [] #additional Mobilize modules to load workers with
-  admins: #emails to send notifications to
-  - email: admin@host.com
 production:
   cycle_freq: 10 #time between Jobtracker sweeps
   notification_freq: 3600 #1 hour between failure/timeout notifications
   runner_read_freq: 300 #5 min between runner reads
   max_run_time: 14400 # if a job runs for 4h+, notification will be sent
   extensions: [] #additional Mobilize modules to load workers with
-  admins: #emails to send notifications to
-  - email: admin@host.com
 ```
 
 <a name='section_Configure_Resque'></a>

data/lib/mobilize-base/extensions/google_drive/file.rb

@@ -3,42 +3,16 @@ module GoogleDrive
 
     def add_worker_acl
       f = self
-      return true if f.has_worker_acl?
-      Mobilize::Gdrive.worker_emails.each do |a| 
-        f.update_acl(a)
-      end
+      email = "#{Mobilize::Gdrive.worker_group_name}@#{Mobilize::Gdrive.domain}"
+      f.update_acl(email,"group")
     end
 
     def add_admin_acl
       f = self
-      #admin includes workers
-      return true if f.has_admin_acl?
-      accounts = (Mobilize::Gdrive.admin_emails + Mobilize::Gdrive.worker_emails).uniq
-      accounts.each do |email|
-        f.update_acl(email)
-      end
-    end
-
-    def has_admin_acl?
-      f = self
-      curr_emails = f.acls.map{|a| a.scope}.compact.sort
-      admin_emails = (Mobilize::Gdrive.admin_emails + Mobilize::Gdrive.worker_emails).uniq
-      if curr_emails == admin_emails or (curr_emails & admin_emails) == admin_emails
-        return true
-      else
-        return false
-      end
-    end
-
-    def has_worker_acl?
-      f = self
-      curr_emails = f.acls.map{|a| a.scope}.compact.sort
-      worker_emails = Mobilize::Gdrive.worker_emails.sort
-      if curr_emails == worker_emails or (curr_emails & worker_emails) == worker_emails
-        return true
-      else
-        return false
-      end
+      email = "#{Mobilize::Gdrive.admin_group_name}@#{Mobilize::Gdrive.domain}"
+      f.update_acl(email,"group")
+      #if adding acl ,must currently add workers as well
+      f.add_worker_acl
     end
 
     def read(user_name)
@@ -51,7 +25,7 @@ module GoogleDrive
       end
     end
 
-    def update_acl(email,role="writer")
+    def update_acl(email,scope_type="user",role="writer")
       f = self
       #need these flags for HTTP retries
       #create req_acl hash to add to current acl
@@ -64,16 +38,16 @@ module GoogleDrive
           if entry.role != role
             #for whatever reason
             f.acl.delete(entry)
-            f.acl.push({:scope_type=>"user",:scope=>email,:role=>role})
+            f.acl.push({:scope_type=>scope_type,:scope=>email,:role=>role})
           end
         elsif !['reader','writer','owner'].include?(role)
           raise "Invalid role #{role}"
         end
       else
         begin
-          f.acl.push({:scope_type=>"user",:scope=>email,:role=>role})
+          f.acl.push({:scope_type=>scope_type,:scope=>email,:role=>role})
         rescue => exc
-          raise exc unless exc.to_s.index("user already has access")
+          raise exc unless exc.to_s.index("already has access")
         end
       end
       return true

data/lib/mobilize-base/handlers/gdrive.rb

@@ -49,10 +49,6 @@ module Mobilize
       Gdrive.workers.map{|w| [w['name'],Gdrive.domain].join("@")}
     end
 
-    def Gdrive.admin_emails
-      Gdrive.admins.map{|w| [w['name'],Gdrive.domain].join("@")}
-    end
-
     #email management - used to make sure not too many emails get used at the same time
     def Gdrive.slot_worker_by_path(path)
       working_slots = Mobilize::Resque.jobs.map{|j| begin j['args'][1]['gdrive_slot'];rescue;nil;end}.compact.uniq

data/lib/mobilize-base/handlers/resque.rb

@@ -19,13 +19,17 @@ module Mobilize
     def Resque.workers(state="all")
       workers = ::Resque.workers.select{|w| w.queues.first == Resque.queue_name}
       return workers if state == 'all'
-      working_workers = workers.select{|w| w.job['queue']== Resque.queue_name}
+      working_workers = workers.select{|w| w.job['queue'] == Resque.queue_name}
       return working_workers if state == 'working'
       idle_workers = workers.select{|w| w.job['queue'].nil?}
       return idle_workers if state == 'idle'
       stale_workers = workers.select{|w| Time.parse(w.started) < Jobtracker.deployed_at}
       return stale_workers if state == 'stale'
-      timeout_workers = workers.select{|w| w.job['payload'] and w.job['payload']['class']!='Jobtracker' and w.job['run_at'] < (Time.now.utc - Jobtracker.max_run_time)}
+      timeout_workers = workers.select do |w|
+                                         w.job['payload'] and
+                                         w.job['payload']['class']!='Jobtracker' and
+                                         w.job['run_at'] < (Time.now.utc - Jobtracker.max_run_time)
+                                       end
       return timeout_workers if state == 'timeout'
       raise "invalid state #{state}"
     end
@@ -115,14 +119,14 @@ module Mobilize
                   s = Stage.where(:path=>stage_path).first
                   if s.params['notify'].to_s=="false"
                     next
-                  elsif s.params['notify'].index("@")
+                  elsif s.params['notify'].to_s.index("@")
                     s.params['notify']
                   else
                     s.job.runner.user.email
                   end
                 rescue ScriptError, StandardError
-                  #jobs without stages are sent to first admin
-                  Jobtracker.admin_emails.first
+                  #jobs without stages are sent to admins
+                  [Gdrive.admin_group_name,Gdrive.domain].join("@")
                 end
         exc_to_s = f['error']
         if fjobs[email].nil?

data/lib/mobilize-base/helpers/jobtracker_helper.rb

@@ -27,10 +27,6 @@ module Mobilize
       Jobtracker.config['admins']
     end
 
-    def Jobtracker.admin_emails
-      Jobtracker.admins.map{|a| a['email'] }
-    end
-
     def Jobtracker.worker
       Resque.find_worker_by_path("jobtracker")
     end

data/lib/mobilize-base/jobtracker.rb

@@ -35,10 +35,12 @@ module Mobilize
                                           end
                                         end.flatten.join("\n\n")
             u = User.where(:name=>email.split("@").first).first
-            runner_dst = Dataset.find_by_url("gsheet://#{u.runner.path}")
-            n['body'] += "\n\n#{runner_dst.http_url}" if runner_dst and runner_dst.http_url
+            if u
+              runner_dst = Dataset.find_by_url("gsheet://#{u.runner.path}")
+              n['body'] += "\n\n#{runner_dst.http_url}" if runner_dst and runner_dst.http_url
+            end
             n['to'] = email
-            n['bcc'] = Jobtracker.admin_emails.join(",")
+            n['bcc'] = [Gdrive.admin_group_name,Gdrive.domain].join("@")
             notifs << n
           end
         end
@@ -52,7 +54,7 @@ module Mobilize
           n = {}
           n['subject'] = "#{lws.length.to_s} max run time jobs"
           n['body'] = bod
-          n['to'] = Jobtracker.admin_emails.join(",")
+          n['to'] = [Gdrive.admin_group_name,Gdrive.domain].join("@")
           notifs << n
         end
         #deliver each email generated

data/lib/mobilize-base/models/runner.rb

@@ -101,9 +101,14 @@ module Mobilize
       return true
     end
 
+    def worker
+      r = self
+      Mobilize::Resque.find_worker_by_path(r.path)
+    end
+
     def enqueue!
       r = self
-      ::Resque::Job.create("mobilize",Runner,r.path,{})
+      ::Resque::Job.create("mobilize",Runner,r.path,{}) unless r.worker
       return true
     end
   end

data/lib/mobilize-base/models/stage.rb

@@ -148,7 +148,7 @@ module Mobilize
 
     def enqueue!
       s = self
-      ::Resque::Job.create("mobilize",Stage,s.path,{})
+      ::Resque::Job.create("mobilize",Stage,s.path,{}) unless s.worker
       return true
     end
 

data/lib/mobilize-base/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Base
-    VERSION = "1.33"
+    VERSION = "1.34"
   end
 end

data/lib/samples/jobtracker.yml

@@ -5,21 +5,15 @@ development:
   runner_read_freq: 300 #5 min between runner reads
   max_run_time: 14400 # if a job runs for 4h+, notification will be sent
   extensions: [] #additional Mobilize modules to load workers with
-  admins: #emails to send notifications to
-  - email: admin@host.com
 test:
   cycle_freq: 10 #time between Jobtracker sweeps
   notification_freq: 3600 #1 hour between failure/timeout notifications
   runner_read_freq: 300 #5 min between runner reads
   max_run_time: 14400 # if a job runs for 4h+, notification will be sent
   extensions: [] #additional Mobilize modules to load workers with
-  admins: #emails to send notifications to
-  - email: admin@host.com
 production:
   cycle_freq: 10 #time between Jobtracker sweeps
   notification_freq: 3600 #1 hour between failure/timeout notifications
   runner_read_freq: 300 #5 min between runner reads
   max_run_time: 14400 # if a job runs for 4h+, notification will be sent
   extensions: [] #additional Mobilize modules to load workers with
-  admins: #emails to send notifications to
-  - email: admin@host.com

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-base
 version: !ruby/object:Gem::Version
-  version: '1.33'
+  version: '1.34'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -229,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -193800591836657576
+      hash: -307993879085768039
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -193800591836657576
+      hash: -307993879085768039
 requirements: []
 rubyforge_project: mobilize-base
 rubygems_version: 1.8.25