Skip to content

Commit b066f27

Browse files
author
Francesco Faraone
committed
LITE-26314 fix logging of consume command
1 parent 854f5f8 commit b066f27

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

dj_cqrs/management/commands/cqrs_consume.py

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,25 @@
1212
from dj_cqrs.registries import ReplicaRegistry
1313

1414

15-
logger = logging.getLogger('django_cqrs.cqrs_consume')
15+
logger = logging.getLogger('django-cqrs')
1616

1717

1818
def consume(**kwargs):
1919
import django
2020
django.setup()
2121

2222
from dj_cqrs.transport import current_transport
23-
current_transport.consume(**kwargs)
23+
try:
24+
current_transport.consume(**kwargs)
25+
except KeyboardInterrupt:
26+
pass
27+
28+
29+
def _display_path(path):
30+
try:
31+
return f'"{path.relative_to(Path.cwd())}"'
32+
except ValueError: # pragma: no cover
33+
return f'"{path}"'
2434

2535

2636
class WorkersManager:
@@ -65,6 +75,10 @@ def run(self):
6575
if self.reload:
6676
for files_changed in self:
6777
if files_changed:
78+
logger.warning(
79+
'Detected changes in %s. Reloading...',
80+
', '.join(map(_display_path, files_changed)),
81+
)
6882
self.restart()
6983
else:
7084
self.stop_event.wait()
@@ -80,11 +94,13 @@ def start(self):
8094
self.consume_kwargs,
8195
)
8296
self.pool.append(process)
97+
logger.info(f'Consumer process with pid {process.pid} started')
8398

8499
def terminate(self, *args, **kwargs):
85100
while self.pool:
86101
process = self.pool.pop()
87102
process.stop(sigint_timeout=self.sigint_timeout, sigkill_timeout=self.sigkill_timeout)
103+
logger.info(f'Consumer process with pid {process.pid} stopped.')
88104

89105
def restart(self, *args, **kwargs):
90106
self.terminate()

0 commit comments

Comments
 (0)