mobilize-base 1.366 → 1.367

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

@@ -74,6 +74,11 @@ module Mobilize
 
     def is_due?
       r = self.reload
+      u = r.user
+      #make sure we're on the right server
+      resque_server = u.resque_server
+      current_server = begin;Socket.gethostbyname(Socket.gethostname);rescue;nil;end
+      return false unless ['127.0.0.1',current_server].include?(resque_server)
       return false if r.is_working?
       prev_due_time = Time.now.utc - Jobtracker.runner_read_freq
       return true if r.started_at.nil? or r.started_at < prev_due_time

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

@@ -117,6 +117,8 @@ module Mobilize
       begin
         err_sheet_name = "#{j.name}_stage#{s.idx.to_s}.err"
         err_sheet_path =  (r.path.split("/")[0..-2] + [err_sheet_name]).join("/")
+        #get a slot, any slot
+        gdrive_slot = Gdrive.worker_emails.sort_by{rand}.first
         err_sheet = Gsheet.find_by_path(err_sheet_path,gdrive_slot)
         err_sheet.delete if err_sheet
       rescue

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

@@ -28,6 +28,26 @@ module Mobilize
       return u.runner.jobs
     end
 
+    #identifies the server which should process this user's jobs
+    #determined by available servers in config/deploy/<env>
+    #otherwise, localhost
+    def resque_server
+      u = self
+      deploy_file_path = "#{Base.root}/config/deploy/#{Base.env}.rb"
+      result = begin
+                 server_line = File.readlines(deploy_file_path).select{|l| l.strip.starts_with?("role ")}.first
+                 #reject arguments that start w symbols
+                 server_strings = server_line.split(",")[1..-1].reject{|t| t.strip.starts_with?(":")}
+                 servers = server_strings.map{|ss| ss.gsub("'","").gsub('"','').strip}
+                 server_i = u.name.to_md5.gsub(/[^0-9]/,'').to_i % servers.length
+                 servers[server_i]
+               rescue
+                 #default to self if this doesn't work
+                 "127.0.0.1"
+               end
+      result
+    end
+
     def runner_path
       u = self
       prefix = "Runner_"

data/lib/mobilize-base/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Base
-    VERSION = "1.366"
+    VERSION = "1.367"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-base
 version: !ruby/object:Gem::Version
-  version: '1.366'
+  version: '1.367'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -234,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2855481328417912899
+      hash: -1055374089226595286
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2855481328417912899
+      hash: -1055374089226595286
 requirements: []
 rubyforge_project: mobilize-base
 rubygems_version: 1.8.25