mobilize-base 1.365 → 1.366
Sign up to get free protection for your applications and to get access to all the features.
@@ -86,7 +86,7 @@ module Mobilize
|
|
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"
|
89
|
-
run_now = if
|
89
|
+
run_now = if `sudo ls #{run_now_dir}`.split("\n").include?("run_now")
|
90
90
|
#delete user's run now file
|
91
91
|
`sudo rm -rf #{run_now_path}`
|
92
92
|
true
|
@@ -26,7 +26,9 @@ module Mobilize
|
|
26
26
|
gdrive_slot = Gdrive.slot_worker_by_path(r.path)
|
27
27
|
unless gdrive_slot
|
28
28
|
r.update_status("no gdrive slot available")
|
29
|
-
|
29
|
+
#re-queue so we can wait for slot
|
30
|
+
r.enqueue!
|
31
|
+
return nil
|
30
32
|
end
|
31
33
|
r.update_attributes(:started_at=>Time.now.utc)
|
32
34
|
begin
|
@@ -83,9 +83,9 @@ module Mobilize
|
|
83
83
|
def complete(response)
|
84
84
|
s = self
|
85
85
|
j = s.job
|
86
|
+
r = j.runner
|
86
87
|
if s.idx == j.stages.length
|
87
88
|
#check for any dependent jobs, if there are, enqueue them
|
88
|
-
r = j.runner
|
89
89
|
dep_jobs = r.jobs.select do |dj|
|
90
90
|
dj.active==true and
|
91
91
|
dj.trigger.strip.downcase == "after #{j.name.downcase}"
|
@@ -93,7 +93,8 @@ module Mobilize
|
|
93
93
|
#put begin/rescue so all dependencies run
|
94
94
|
dep_jobs.each do |dj|
|
95
95
|
begin
|
96
|
-
|
96
|
+
dj_methods = dj.stages.map{|ds| "#{ds.handler}.#{ds.call}"}.uniq
|
97
|
+
unless dj.is_working? or (Jobtracker.disabled_methods & dj_methods).length>0
|
97
98
|
dj.stages.first.update_attributes(:retries_done=>0)
|
98
99
|
dj.stages.first.enqueue!
|
99
100
|
end
|
@@ -131,11 +132,6 @@ module Mobilize
|
|
131
132
|
j = s.job
|
132
133
|
r = j.runner
|
133
134
|
u = r.user
|
134
|
-
begin
|
135
|
-
j.update_attributes(:active=>false) if s.params['always_on'].to_s=="false"
|
136
|
-
rescue StandardError, ScriptError
|
137
|
-
#skip due to parse error on params
|
138
|
-
end
|
139
135
|
s.update_attributes(:failed_at=>Time.now.utc,:response=>response)
|
140
136
|
stage_name = "#{j.name}_stage#{s.idx.to_s}.err"
|
141
137
|
target_path = (r.path.split("/")[0..-2] + [stage_name]).join("/")
|
data/lib/mobilize-base/tasks.rb
CHANGED
@@ -65,7 +65,7 @@ namespace :mobilize do
|
|
65
65
|
Mobilize::Jobtracker.restart!
|
66
66
|
end
|
67
67
|
desc "Add a user and set up local files"
|
68
|
-
task :
|
68
|
+
task :add_user, :name, :env do |t,args|
|
69
69
|
ENV['MOBILIZE_ENV']=args.env
|
70
70
|
require 'mobilize-base'
|
71
71
|
u = Mobilize::User.find_or_create_by_name(args.name)
|
@@ -83,6 +83,13 @@ namespace :mobilize do
|
|
83
83
|
user,job,stage = args.path.split("/")
|
84
84
|
Mobilize::Stage.where(path: "Runner_#{user}/jobs/#{job}/#{stage}").first.enqueue!
|
85
85
|
end
|
86
|
+
desc "Remap http_url for Gbook, Gfile, etc."
|
87
|
+
task :remap_http_url, :handler, :path, :http_url, :env do |t,args|
|
88
|
+
ENV['MOBILIZE_ENV']=args.env
|
89
|
+
require 'mobilize-base'
|
90
|
+
dst = Mobilize::Dataset.find_or_create_by_handler_and_path(args.handler,args.path)
|
91
|
+
dst.update_attributes(:http_url=>args.http_url)
|
92
|
+
end
|
86
93
|
desc "kill all old resque web processes, start new one with resque_web.rb extension file"
|
87
94
|
task :resque_web, :env do |t,args|
|
88
95
|
ENV['MOBILIZE_ENV']=args.env
|
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.366'
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-06-
|
12
|
+
date: 2013-06-28 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rake
|
@@ -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: 2855481328417912899
|
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: 2855481328417912899
|
247
247
|
requirements: []
|
248
248
|
rubyforge_project: mobilize-base
|
249
249
|
rubygems_version: 1.8.25
|