web47core 3.2.6 → 3.2.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/app/models/command_job.rb +14 -2
- data/lib/web47core/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 998801eca3b3e54c48a069b4d7314fefb4b65fb3ee79663614b6bad6143eb470
|
4
|
+
data.tar.gz: f51caf108f0c544036eb5f949c72a3dfae98bde64bc1a57ef3ef8ac874e516e5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fb14648cc706c95f806192e5a6e7bee71de7bae0d07666f45440ab52b0b0660585d9914aa2f21ccbcfde5c0e56365d0f09663c4d15819152665854de09f6fefc
|
7
|
+
data.tar.gz: 9a8eb01bd565a883fccac315eb76a6dff2ab0176eb4fa0cbe33e9ba7d5d0fda3549938a2ad42e8f1ec7565ea1003c97fc73fe75cee4f91d75a3b5278af871d23
|
@@ -27,20 +27,32 @@ class CommandJob
|
|
27
27
|
field :error_message, type: String
|
28
28
|
field :started_at, type: Time
|
29
29
|
field :finished_at, type: Time
|
30
|
+
field :cancelled_at, type: Time
|
30
31
|
#
|
31
32
|
# Relationships
|
32
33
|
#
|
33
34
|
has_many :logs, class_name: 'CommandJobLog', dependent: :destroy
|
34
|
-
belongs_to :started_by,
|
35
|
+
belongs_to :started_by, polymorphic: true, optional: true, inverse_of: nil
|
36
|
+
belongs_to :cancelled_by, polymorphic: true, optional: true, inverse_of: nil
|
35
37
|
#
|
36
38
|
# Validations
|
37
39
|
#
|
38
40
|
validates :state, inclusion: { in: ALL_STATES }
|
39
41
|
|
42
|
+
# @abstract cancel the current job
|
43
|
+
def cancel!(actor)
|
44
|
+
update!(cancelled_by: actor, cancelled_at: Time.now.utc, state: STATE_CANCELLED) unless completed?
|
45
|
+
child_jobs.each { |j| j.cancel!(actor) }
|
46
|
+
end
|
47
|
+
|
48
|
+
def child_jobs
|
49
|
+
[]
|
50
|
+
end
|
51
|
+
|
40
52
|
# @abstract duration for the job
|
41
53
|
# @return Integer - How long this job took in milliseconds
|
42
54
|
def duration
|
43
|
-
finished_at - started_at
|
55
|
+
succeeded? ? finished_at - started_at : 0
|
44
56
|
rescue StandardError
|
45
57
|
0
|
46
58
|
end
|
data/lib/web47core/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: web47core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.2.
|
4
|
+
version: 3.2.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Chris Schroeder
|
@@ -501,7 +501,7 @@ dependencies:
|
|
501
501
|
- !ruby/object:Gem::Version
|
502
502
|
version: '0'
|
503
503
|
- !ruby/object:Gem::Dependency
|
504
|
-
name:
|
504
|
+
name: simplecov_lcov_formatter
|
505
505
|
requirement: !ruby/object:Gem::Requirement
|
506
506
|
requirements:
|
507
507
|
- - ">="
|