mobilize-base 1.370 → 1.371

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

@@ -43,7 +43,14 @@ module Mobilize
 
     def Gdrive.workers(email=nil)
       if email.nil?
-        Gdrive.config['workers']
+        #divide worker array into equal number of parts
+        #as there are deploy servers
+        servers = Jobtracker.deploy_servers
+        workers = Gdrive.config['workers']
+        current_server = Jobtracker.current_server || servers.first
+        server_i = servers.index(current_server)
+        server_workers = workers.in_groups(servers.length,false)[server_i]
+        return server_workers
       else
         Gdrive.workers.select{|w| [w['name'],Gdrive.domain].join("@") == email}.first
       end

data/lib/mobilize-base/jobtracker.rb

@@ -74,6 +74,27 @@ module Mobilize
       return true
     end
 
+    def Jobtracker.deploy_servers
+      servers = begin
+                  deploy_file_path = "#{Base.root}/config/deploy/#{Base.env}.rb"
+                  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?(":")}
+                  server_strings.map{|ss| ss.gsub("'","").gsub('"','').strip}
+                rescue
+                  ["127.0.0.1"]
+                end
+      servers
+    end
+
+    def Jobtracker.current_server
+      begin
+        Socket.gethostbyname(Socket.gethostname).first
+      rescue
+        nil
+      end
+    end
+
     def Jobtracker.perform(id,*args)
       while Jobtracker.status != 'stopping'
         users = User.all

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

@@ -23,13 +23,7 @@ module Mobilize
     def Runner.perform(id,*args)
       r = Runner.find_by_path(id)
       #get gdrive slot for read
-      gdrive_slot = Gdrive.slot_worker_by_path(r.path)
-      unless gdrive_slot
-        r.update_status("no gdrive slot available")
-        #re-queue so we can wait for slot
-        r.enqueue!
-        return nil
-      end
+      gdrive_slot = Gdrive.slot_worker_by_path(r.path) || Gdrive.worker_emails.sort_by{rand}.first
       r.update_attributes(:started_at=>Time.now.utc)
       begin
         #make sure any updates to activity are processed first
@@ -127,7 +121,7 @@ module Mobilize
       r = self
       u = r.user
       resque_server = u.resque_server
-      current_server = begin;Socket.gethostbyname(Socket.gethostname).first;rescue;nil;end
+      current_server = Jobtracker.current_server
       return true if ['127.0.0.1',current_server].include?(resque_server)
     end
 

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

@@ -33,19 +33,9 @@ module Mobilize
     #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
+      servers = Jobtracker.deploy_servers
+      server_i = u.name.to_md5.gsub(/[^0-9]/,'').to_i % servers.length
+      servers[server_i]
     end
 
     def runner_path

data/lib/mobilize-base/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Base
-    VERSION = "1.370"
+    VERSION = "1.371"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-base
 version: !ruby/object:Gem::Version
-  version: '1.370'
+  version: '1.371'
   prerelease: 
 platform: ruby
 authors:
@@ -234,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2127778661316611093
+      hash: -4607436373459673499
 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: 2127778661316611093
+      hash: -4607436373459673499
 requirements: []
 rubyforge_project: mobilize-base
 rubygems_version: 1.8.25