daemon_runner 0.4.0 → 0.4.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/daemon_runner/client.rb +12 -8
- data/lib/daemon_runner/shell_out.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9a40696f28e6af1d205de21719f33bcd617b3a6a
|
4
|
+
data.tar.gz: 72d29ef5129936ee5a64c0f159b32db2966f5a32
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 05d11eb3122cd995603c1e21b0d66af72a467dfac4cf1a701e32260744eb09d6dc808a966a17547024d08d685ef5306a9391fc937bd906ffed6465ad1c4f0272
|
7
|
+
data.tar.gz: 0f2202f3091650a471edab3567a51fa7b1f76b9dd2f2147f701c38fc41f62625910e4be0ce7278d8350839e0d5ca29d2e82e9ee3958da188b426d33067395eff
|
data/lib/daemon_runner/client.rb
CHANGED
@@ -19,20 +19,20 @@ module DaemonRunner
|
|
19
19
|
error_sleep_time = job[:error_sleep_time]
|
20
20
|
on_error_release_lock = job[:on_error_release_lock]
|
21
21
|
logger = job[:logger]
|
22
|
-
|
22
|
+
logger_name = job[:logger_name]
|
23
23
|
|
24
24
|
mutex = @mutexes[task_id]
|
25
25
|
|
26
|
-
logger.error "#{
|
27
|
-
logger.debug "#{
|
28
|
-
logger.debug "#{
|
26
|
+
logger.error "#{logger_name}: #{error}"
|
27
|
+
logger.debug "#{logger_name}: #{error.backtrace.join("\n")}"
|
28
|
+
logger.debug "#{logger_name}: Suspending #{logger_name} for #{error_sleep_time} seconds"
|
29
29
|
|
30
30
|
# Unlock the job mutex if the job owns it and on_error_release_lock is true
|
31
31
|
mutex.unlock if on_error_release_lock && mutex.owned?
|
32
32
|
|
33
33
|
sleep error_sleep_time
|
34
34
|
|
35
|
-
logger.debug "#{
|
35
|
+
logger.debug "#{logger_name}: Resuming #{logger_name}"
|
36
36
|
end
|
37
37
|
end
|
38
38
|
|
@@ -148,6 +148,8 @@ module DaemonRunner
|
|
148
148
|
out[:task_id] = "#{out[:class_name]}.#{out[:method]}"
|
149
149
|
end
|
150
150
|
|
151
|
+
out[:logger_name] = "#{out[:class_name]}.#{out[:method]}"
|
152
|
+
|
151
153
|
raise ArgumentError, 'Invalid task id' if out[:task_id].nil? || out[:task_id].empty?
|
152
154
|
|
153
155
|
out[:args] = task[2..-1].flatten
|
@@ -188,9 +190,10 @@ module DaemonRunner
|
|
188
190
|
method = parsed_task[:method]
|
189
191
|
args = parsed_task[:args]
|
190
192
|
task_id = parsed_task[:task_id]
|
193
|
+
logger_name = parsed_task[:logger_name]
|
191
194
|
|
192
195
|
# Schedule the task
|
193
|
-
schedule_log_line = "#{
|
196
|
+
schedule_log_line = "#{logger_name}: Scheduling job #{class_name}.#{method} as `:#{schedule[:type]}` type"
|
194
197
|
schedule_log_line += " with schedule: #{schedule[:schedule]}"
|
195
198
|
logger.debug schedule_log_line
|
196
199
|
|
@@ -198,7 +201,7 @@ module DaemonRunner
|
|
198
201
|
opts.merge!(schedule[:extra_opts]) if schedule.key?(:extra_opts)
|
199
202
|
|
200
203
|
scheduler.send(schedule[:type], schedule[:schedule], opts) do |job|
|
201
|
-
log_line = "#{
|
204
|
+
log_line = "#{logger_name}: Running #{class_name}.#{method}"
|
202
205
|
log_line += "(#{args})" unless args.empty?
|
203
206
|
logger.debug log_line
|
204
207
|
|
@@ -206,13 +209,14 @@ module DaemonRunner
|
|
206
209
|
job[:on_error_release_lock] = on_error_release_lock
|
207
210
|
job[:logger] = logger
|
208
211
|
job[:task_id] = task_id
|
212
|
+
job[:logger_name] = logger_name
|
209
213
|
|
210
214
|
out = if args.empty?
|
211
215
|
instance.send(method.to_sym)
|
212
216
|
else
|
213
217
|
instance.send(method.to_sym, args)
|
214
218
|
end
|
215
|
-
logger.debug "#{
|
219
|
+
logger.debug "#{logger_name}: Got: #{out}"
|
216
220
|
end
|
217
221
|
end
|
218
222
|
|
@@ -94,7 +94,7 @@ module DaemonRunner
|
|
94
94
|
# Setup a new Mixlib::ShellOut client runner
|
95
95
|
# @return [Mixlib::ShellOut] client
|
96
96
|
def runner
|
97
|
-
@runner
|
97
|
+
@runner = Mixlib::ShellOut.new(command, :cwd => cwd, :timeout => timeout)
|
98
98
|
@runner.valid_exit_codes = valid_exit_codes
|
99
99
|
end
|
100
100
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: daemon_runner
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Andrew Thompson
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-11-
|
11
|
+
date: 2016-11-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: logging
|