rbbt-util 5.17.4 → 5.17.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/share/rbbt_commands/system/clean +4 -4
- data/share/rbbt_commands/system/status +8 -2
- 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: ebbbcd7563b7c4c3bd68ac9ebef1d81318430cf4
|
|
4
|
+
data.tar.gz: f3f0e6c0b52149de5fc1d2dfda1e88afda0963e1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8756e82fa2249eae15ffe96ee0cb81b94964f4e0eb84fd1588248440ed12cb9b3030c2801741b66cb44d456fe5ac396784d48789f5b12bcab3bc02ff58d69f16
|
|
7
|
+
data.tar.gz: 72210aa14174435437a7420472f231782aa150c990036fcbadd46a44e96b136ebdd5ab6be5146700869d06e38868cbbee2a0aa00c80d24c45ef25a3ce45058be
|
|
@@ -76,7 +76,6 @@ jobs = Rbbt.job_info workflow, task
|
|
|
76
76
|
workflows = {}
|
|
77
77
|
|
|
78
78
|
jobs.each do |file,i|
|
|
79
|
-
next if i[:done]
|
|
80
79
|
info = begin
|
|
81
80
|
Open.open(i[:info_file]) do |f|
|
|
82
81
|
Marshal.load(f)
|
|
@@ -87,12 +86,13 @@ jobs.each do |file,i|
|
|
|
87
86
|
|
|
88
87
|
pid = info[:pid]
|
|
89
88
|
|
|
90
|
-
status = info[:status]
|
|
91
|
-
status = :missing if status ==
|
|
89
|
+
status = info[:status].to_s
|
|
90
|
+
status = :missing if status == "done" and not File.exists? file
|
|
92
91
|
status = :dead if status != "done" and pid and not Misc.pid_exists?(pid)
|
|
92
|
+
status = :sync if status != "done" and File.exists? file
|
|
93
93
|
|
|
94
94
|
status = status.to_s
|
|
95
|
-
next unless status =~ /\berror$/ or status =~ /\bmissing$/ or status =~ /\baborted$/ or status =~ /\bdead$/ or status == "" or (force and status == 'noinfo')
|
|
95
|
+
next unless status =~ /\berror$/ or status =~ /\bmissing$/ or status =~ /\baborted$/ or status =~ /\bdead$/ or status =~ /\bsync$/ or status == "" or (force and status == 'noinfo')
|
|
96
96
|
puts " Removing #{ file } - #{status}"
|
|
97
97
|
Step.clean(file)
|
|
98
98
|
end
|
|
@@ -116,7 +116,7 @@ jobs = Rbbt.job_info workflow, task
|
|
|
116
116
|
workflows = {}
|
|
117
117
|
|
|
118
118
|
jobs.each do |file,info|
|
|
119
|
-
next unless all or not info[:done]
|
|
119
|
+
next unless all or not info[:done] or not File.exists? file
|
|
120
120
|
workflow = info[:workflow]
|
|
121
121
|
task = info[:task]
|
|
122
122
|
workflows[workflow] ||= {}
|
|
@@ -141,7 +141,13 @@ workflows.sort.each do |workflow,tasks|
|
|
|
141
141
|
status = info[:status]
|
|
142
142
|
status = :missing if status == :done and not File.exists? file
|
|
143
143
|
status = status.to_s
|
|
144
|
-
|
|
144
|
+
if status != "done" and pid and not Misc.pid_exists?(pid)
|
|
145
|
+
if File.exists? file
|
|
146
|
+
status << Log.color(:red, " (out of sync)")
|
|
147
|
+
else
|
|
148
|
+
status << Log.color(:red, " (dead)")
|
|
149
|
+
end
|
|
150
|
+
end
|
|
145
151
|
str = file.dup
|
|
146
152
|
str << " #{ status_msg status }"
|
|
147
153
|
str << "; #{pid_msg pid}" unless status == "done"
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: rbbt-util
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 5.17.
|
|
4
|
+
version: 5.17.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Miguel Vazquez
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-03-
|
|
11
|
+
date: 2015-03-12 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|