mobilize-base 1.367 → 1.368
Sign up to get free protection for your applications and to get access to all the features.
@@ -71,18 +71,5 @@ module Mobilize
|
|
71
71
|
r = self
|
72
72
|
Mobilize::Resque.active_paths.include?(r.path)
|
73
73
|
end
|
74
|
-
|
75
|
-
def is_due?
|
76
|
-
r = self.reload
|
77
|
-
u = r.user
|
78
|
-
#make sure we're on the right server
|
79
|
-
resque_server = u.resque_server
|
80
|
-
current_server = begin;Socket.gethostbyname(Socket.gethostname);rescue;nil;end
|
81
|
-
return false unless ['127.0.0.1',current_server].include?(resque_server)
|
82
|
-
return false if r.is_working?
|
83
|
-
prev_due_time = Time.now.utc - Jobtracker.runner_read_freq
|
84
|
-
return true if r.started_at.nil? or r.started_at < prev_due_time
|
85
|
-
end
|
86
|
-
|
87
74
|
end
|
88
75
|
end
|
@@ -82,7 +82,7 @@ module Mobilize
|
|
82
82
|
#so none are privileged on JT restarts
|
83
83
|
users.sort_by{rand}.each do |u|
|
84
84
|
r = u.runner
|
85
|
-
Jobtracker.update_status("Checking #{r.path}")
|
85
|
+
Jobtracker.update_status("Checking #{r.path}") if r.is_on_server?
|
86
86
|
#check for run_now file
|
87
87
|
run_now_dir = "/home/#{u.name}/mobilize/"
|
88
88
|
run_now_path = "#{run_now_dir}run_now"
|
@@ -122,5 +122,22 @@ module Mobilize
|
|
122
122
|
::Resque::Job.create("mobilize",Runner,r.path,{})
|
123
123
|
return true
|
124
124
|
end
|
125
|
+
|
126
|
+
def is_on_server?
|
127
|
+
r = self
|
128
|
+
u = r.user
|
129
|
+
resque_server = u.resque_server
|
130
|
+
current_server = begin;Socket.gethostbyname(Socket.gethostname).first;rescue;nil;end
|
131
|
+
return true if ['127.0.0.1',current_server].include?(resque_server)
|
132
|
+
end
|
133
|
+
|
134
|
+
def is_due?
|
135
|
+
r = self.reload
|
136
|
+
#make sure we're on the right server
|
137
|
+
return false unless r.is_on_server?
|
138
|
+
return false if r.is_working?
|
139
|
+
prev_due_time = Time.now.utc - Jobtracker.runner_read_freq
|
140
|
+
return true if r.started_at.nil? or r.started_at < prev_due_time
|
141
|
+
end
|
125
142
|
end
|
126
143
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: mobilize-base
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: '1.
|
4
|
+
version: '1.368'
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -234,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
234
234
|
version: '0'
|
235
235
|
segments:
|
236
236
|
- 0
|
237
|
-
hash: -
|
237
|
+
hash: -4573752889268701268
|
238
238
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
239
239
|
none: false
|
240
240
|
requirements:
|
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
243
243
|
version: '0'
|
244
244
|
segments:
|
245
245
|
- 0
|
246
|
-
hash: -
|
246
|
+
hash: -4573752889268701268
|
247
247
|
requirements: []
|
248
248
|
rubyforge_project: mobilize-base
|
249
249
|
rubygems_version: 1.8.25
|