Skip to content

Commit a150858

Browse files
authored
Merge pull request #9 from RHDZMOTA/DEV
2022-09-14 RELEASE-PRD (1)
2 parents 8a2ff23 + 9d0ac51 commit a150858

9 files changed

Lines changed: 39 additions & 22 deletions

File tree

src/rhdzmota/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.0
1+
2.1.0

src/rhdzmota/celery.py

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,34 @@
11
from celery import Celery
22

3+
from .heartbeat.daemon import Daemon
34
from .settings import (
4-
RHDZMOTA_CELERY_BROKER_HOST
5+
RHDZMOTA_CELERY_BROKER_HOST,
6+
RHDZMOTA_DAEMON_NAME
57
)
68

79

810
# Celery application instance
911
app = Celery(
1012
"tasks",
1113
broker=f"redis://{RHDZMOTA_CELERY_BROKER_HOST}",
14+
backend=f"redis://{RHDZMOTA_CELERY_BROKER_HOST}",
1215
)
16+
17+
app.conf.update(
18+
task_routes={
19+
"rhdzmota.celery.daemon_heartbeat_publisher": {
20+
"queue": "queue_heartbeat"
21+
}
22+
}
23+
)
24+
25+
26+
@app.task
27+
def daemon_heartbeat_publisher(**kwargs):
28+
print(kwargs)
29+
30+
31+
# Daemon instance
32+
if RHDZMOTA_DAEMON_NAME:
33+
daemon = Daemon(name=RHDZMOTA_DAEMON_NAME, publisher=daemon_heartbeat_publisher, interval=3)
34+
daemon.broadcast()

src/rhdzmota/celery_worker_hello.py

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/rhdzmota/celery_workers/__init__.py

Whitespace-only changes.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
from ..celery import app
3+
4+
5+
@app.task
6+
def worker(name: str) -> str:
7+
return f"Hello, {name or 'world'}!"

src/rhdzmota/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def hello(self, world: Optional[str] = None, sleep: int = 1, delegate: bool = Fa
1616
world = world or "world"
1717
time.sleep(sleep)
1818
try:
19-
from .celery_worker_hello import worker
19+
from .celery_workers.hello import worker
2020

2121
if delegate:
2222
return worker.delay(name=world)

src/rhdzmota/settings.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ def singleton(cls, overwrite_config_dictionary: Optional[Dict] = None) -> 'Logge
130130
default="127.0.0.1"
131131
)
132132

133+
# Daemon
134+
RHDZMOTA_DAEMON_NAME = get_environ_variable(
135+
name="RHDZMOTA_DAEMON_NAME",
136+
)
137+
133138
# JWT
134139

135140
JWT_ENCRYPTION_ALGORITHM: str = get_environ_variable(

worker-heartbeat.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
celery -A rhdzmota.celery worker --loglevel=INFO --concurrency=1 -O fair -P prefork -Q queue_heartbeat

worker-hello.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
celery -A rhdzmota.celery_worker_hello worker --loglevel=INFO --concurrency=2 -O fair -P prefork
1+
celery -A rhdzmota.celery_workers.hello worker --loglevel=INFO --concurrency=2 -O fair -P prefork

0 commit comments

Comments
 (0)