Disable ping worker, use docker instead

golemfactory · Aug 21, 2024 · b40a71e · b40a71e
1 parent 88d2cb1
commit b40a71e
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 33 deletions.
diff --git a/docker-stack/docker-compose-prod.yml b/docker-stack/docker-compose-prod.yml
@@ -162,32 +162,32 @@ services:
                 condition: any
         networks:
             - reputation
-    ping_worker:
-        command:
-            [
-                "/bin/sh",
-                "-c",
-                "/wait-for-it.sh ${POSTGRES_DB} -- /reputation-backend/start.sh; celery -A core worker -l INFO -Q pinger -c 1",
-            ]
-        image: ghcr.io/golemfactory/golem-reputation-backend-celery-yagna:latest
-        env_file:
-            - ./.envs/.django
-        healthcheck:
-            test: /check_yagna.sh || exit 1
-            interval: 15s
-            timeout: 5s
-            retries: 3
-            start_period: 15s
-        deploy:
-            replicas: 1
-            update_config:
-                parallelism: 1
-                failure_action: rollback
-                delay: 10s
-            restart_policy:
-                condition: any
-        networks:
-            - reputation
+    # ping_worker:
+    #     command:
+    #         [
+    #             "/bin/sh",
+    #             "-c",
+    #             "/wait-for-it.sh ${POSTGRES_DB} -- /reputation-backend/start.sh; celery -A core worker -l INFO -Q pinger -c 1",
+    #         ]
+    #     image: ghcr.io/golemfactory/golem-reputation-backend-celery-yagna:latest
+    #     env_file:
+    #         - ./.envs/.django
+    #     healthcheck:
+    #         test: /check_yagna.sh || exit 1
+    #         interval: 15s
+    #         timeout: 5s
+    #         retries: 3
+    #         start_period: 15s
+    #     deploy:
+    #         replicas: 1
+    #         update_config:
+    #             parallelism: 1
+    #             failure_action: rollback
+    #             delay: 10s
+    #         restart_policy:
+    #             condition: any
+    #     networks:
+    #         - reputation
     celery_beat:
         image: ghcr.io/golemfactory/golem-reputation-backend-celery-beat:latest
         command: celery -A core beat -l INFO

diff --git a/docker-stack/golem-reputation-backend/p2p-ping.py b/docker-stack/golem-reputation-backend/p2p-ping.py
@@ -156,7 +156,7 @@ async def ping_providers(p2p):
 
 # Run the script continuously
 async def main():
-    p2p = True  # Adjust this as needed
+    p2p = os.environ.get('P2P', 'false').lower() == 'true'
     while True:
         await ping_providers(p2p)
 

diff --git a/docker-stack/golem-reputation-backend/reputation-backend/core/celery.py b/docker-stack/golem-reputation-backend/reputation-backend/core/celery.py
@@ -71,12 +71,12 @@ def setup_periodic_tasks(sender, **kwargs):
         queue="default",
         options={"queue": "default", "routing_key": "default"},
     )
-    sender.add_periodic_task(
-        30.0,
-        ping_providers_task.s(p2p=False),
-        queue="pinger",
-        options={"queue": "pinger", "routing_key": "pinger"},
-    )
+#    sender.add_periodic_task( Not needed anymore, separate docker task now.
+#        30.0,
+#        ping_providers_task.s(p2p=False),
+#        queue="pinger",
+#        options={"queue": "pinger", "routing_key": "pinger"},
+#    )
     sender.add_periodic_task(
         30.0,
         process_offers_from_redis.s(),