File tree 2 files changed +20
-22
lines changed
2 files changed +20
-22
lines changed Original file line number Diff line number Diff line change @@ -37,11 +37,21 @@ def configured_processes
37
37
end
38
38
39
39
def valid?
40
- skip_recurring_tasks? || recurring_tasks . none ? || recurring_tasks . all? ( & :valid ?)
40
+ configured_processes . any? && ( skip_recurring_tasks ? || invalid_tasks . none ?)
41
41
end
42
42
43
- def invalid_tasks
44
- recurring_tasks . select ( &:invalid? )
43
+ def error_messages
44
+ if configured_processes . none?
45
+ "No workers or processed configured. Exiting..."
46
+ else
47
+ error_messages = invalid_tasks . map do |task |
48
+ all_messages = task . errors . full_messages . map { |msg | "\t #{ msg } " } . join ( "\n " )
49
+ "#{ task . key } :\n #{ all_messages } "
50
+ end
51
+ . join ( "\n " )
52
+
53
+ "Invalid processes configured:\n #{ error_messages } "
54
+ end
45
55
end
46
56
47
57
def max_number_of_threads
@@ -62,6 +72,10 @@ def default_options
62
72
}
63
73
end
64
74
75
+ def invalid_tasks
76
+ recurring_tasks . select ( &:invalid? )
77
+ end
78
+
65
79
def only_work?
66
80
options [ :only_work ]
67
81
end
Original file line number Diff line number Diff line change @@ -10,28 +10,12 @@ def start(**options)
10
10
SolidQueue . supervisor = true
11
11
configuration = Configuration . new ( **options )
12
12
13
- if configuration . configured_processes . any?
14
- if configuration . valid?
15
- new ( configuration ) . tap ( &:start )
16
- else
17
- abort_due_to_invalid_tasks ( configuration )
18
- end
13
+ if configuration . valid?
14
+ new ( configuration ) . tap ( &:start )
19
15
else
20
- abort "No workers or processed configured. Exiting..."
16
+ abort configuration . error_messages
21
17
end
22
18
end
23
-
24
- private
25
- def abort_due_to_invalid_tasks ( configuration )
26
- error_messages = configuration . invalid_tasks
27
- . map do |task |
28
- all_messages = task . errors . full_messages . map { |msg | "\t #{ msg } " } . join ( "\n " )
29
- "#{ task . key } :\n #{ all_messages } "
30
- end
31
- . join ( "\n " )
32
-
33
- abort "Invalid processes configured:\n #{ error_messages } "
34
- end
35
19
end
36
20
37
21
def initialize ( configuration )
You can’t perform that action at this time.
0 commit comments