mobilize-base 1.367 → 1.368

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

@@ -71,18 +71,5 @@ module Mobilize
       r = self
       Mobilize::Resque.active_paths.include?(r.path)
     end
-
-    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
-    end
-
   end
 end

data/lib/mobilize-base/jobtracker.rb

@@ -82,7 +82,7 @@ module Mobilize
         #so none are privileged on JT restarts
         users.sort_by{rand}.each do |u|
           r = u.runner
-          Jobtracker.update_status("Checking #{r.path}")
+          Jobtracker.update_status("Checking #{r.path}") if r.is_on_server?
           #check for run_now file
           run_now_dir = "/home/#{u.name}/mobilize/"
           run_now_path = "#{run_now_dir}run_now"

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

@@ -122,5 +122,22 @@ module Mobilize
       ::Resque::Job.create("mobilize",Runner,r.path,{})
       return true
     end
+
+    def is_on_server?
+      r = self
+      u = r.user
+      resque_server = u.resque_server
+      current_server = begin;Socket.gethostbyname(Socket.gethostname).first;rescue;nil;end
+      return true if ['127.0.0.1',current_server].include?(resque_server)
+    end
+
+    def is_due?
+      r = self.reload
+      #make sure we're on the right server
+      return false unless r.is_on_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
+    end
   end
 end

data/lib/mobilize-base/version.rb

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

metadata

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