Skip to content

Commit 93ae90a

Browse files
committed
Move #stop and #stopped? to Processes:Base
As these are all common between all processes.
1 parent 338c1e8 commit 93ae90a

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

lib/solid_queue/processes/base.rb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ class Base
1010

1111
def initialize(*)
1212
@name = generate_name
13+
@stopped = false
1314
end
1415

1516
def kind
@@ -28,10 +29,18 @@ def metadata
2829
{}
2930
end
3031

32+
def stop
33+
@stopped = true
34+
end
35+
3136
private
3237
def generate_name
3338
[ kind.downcase, SecureRandom.hex(10) ].join("-")
3439
end
40+
41+
def stopped?
42+
@stopped
43+
end
3544
end
3645
end
3746
end

lib/solid_queue/processes/runnable.rb

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ def start
1717
end
1818

1919
def stop
20-
@stopped = true
21-
wake_up
20+
super
2221

22+
wake_up
2323
@thread&.join
2424
end
2525

@@ -33,8 +33,6 @@ def mode
3333
def boot
3434
SolidQueue.instrument(:start_process, process: self) do
3535
run_callbacks(:boot) do
36-
@stopped = false
37-
3836
if running_as_fork?
3937
register_signal_handlers
4038
set_procline
@@ -51,10 +49,6 @@ def run
5149
raise NotImplementedError
5250
end
5351

54-
def stopped?
55-
@stopped
56-
end
57-
5852
def finished?
5953
running_inline? && all_work_completed?
6054
end

lib/solid_queue/supervisor.rb

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,15 @@ def start
3131
run_start_hooks
3232

3333
start_processes
34+
35+
launch_heartbeat
3436
launch_maintenance_task
3537

3638
supervise
3739
end
3840

3941
def stop
40-
@stopped = true
42+
super
4143
run_stop_hooks
4244
end
4345

@@ -47,7 +49,6 @@ def stop
4749
def boot
4850
SolidQueue.instrument(:start_process, process: self) do
4951
run_callbacks(:boot) do
50-
@stopped = false
5152
sync_std_streams
5253
end
5354
end
@@ -87,10 +88,6 @@ def start_process(configured_process)
8788
forks[pid] = process_instance
8889
end
8990

90-
def stopped?
91-
@stopped
92-
end
93-
9491
def set_procline
9592
procline "supervising #{supervised_processes.join(", ")}"
9693
end

0 commit comments

Comments
 (0)