.deploy/deploy-prod.yaml

@@ -3,12 +3,29 @@ version: "3.4"
 
 services:
 
+  poll:
+    image: mathwave/sprint-repo:ruz-bot
+    environment:
+      STAGE: "production"
+      TELEGRAM_TOKEN: $TELEGRAM_TOKEN_PROD
+    networks:
+      - queues
+    command: poll
+    deploy:
+      mode: replicated
+      restart_policy:
+        condition: any
+      update_config:
+        parallelism: 1
+        order: start-first
+
   worker:
     image: mathwave/sprint-repo:ruz-bot
     environment:
       MONGO_HOST: "mongo.sprinthub.ru"
       STAGE: "production"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
+      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
     networks:
       - queues
       - configurator
@@ -21,21 +38,41 @@ services:
         parallelism: 1
         order: start-first
 
+  mailbox:
+    image: mathwave/sprint-repo:ruz-bot
+    environment:
+      STAGE: "production"
+      TELEGRAM_TOKEN: $TELEGRAM_TOKEN_PROD
+    networks:
+      - queues
+    command: mailbox
+    deploy:
+      mode: replicated
+      restart_policy:
+        condition: any
+      update_config:
+        parallelism: 1
+        order: start-first
+
   fetch:
     image: mathwave/sprint-repo:ruz-bot
     environment:
       MONGO_HOST: "mongo.sprinthub.ru"
       STAGE: "production"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
+      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
       DEBUG: "false"
     networks:
       - queues
-      - configurator
     command: fetch
     deploy:
       mode: replicated
       restart_policy:
         condition: any
+      placement:
+        constraints:
+          - node.role == worker
+          - node.labels.zone == ru
       update_config:
         parallelism: 1
         order: start-first
@@ -46,15 +83,19 @@ services:
       MONGO_HOST: "mongo.sprinthub.ru"
       STAGE: "production"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
+      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
       DEBUG: "false"
     networks:
       - queues
-      - configurator
     command: notify
     deploy:
       mode: replicated
       restart_policy:
         condition: any
+      placement:
+        constraints:
+          - node.role == worker
+          - node.labels.zone == ru
       update_config:
         parallelism: 1
         order: start-first
@@ -63,17 +104,21 @@ services:
     image: mathwave/sprint-repo:ruz-bot
     networks:
       - common-infra-nginx
-      - configurator
     environment:
       MONGO_HOST: "mongo.sprinthub.ru"
       STAGE: "production"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
+      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
       DEBUG: "false"
     command: api
     deploy:
       mode: replicated
       restart_policy:
         condition: any
+      placement:
+        constraints:
+          - node.role == worker
+          - node.labels.zone == ru
       update_config:
         parallelism: 1
         order: start-first

helpers/answer.py

@@ -77,7 +77,7 @@ class Answer:
         body = {'text': text, 'chat_id': self.user['chat_id'], 'parse_mode': 'Markdown'}
         if reply_markup:
             body['reply_markup'] = reply_markup.to_json()
-        queues.set_task('botalka_mailbox', {'project': 'ruz-bot', 'name': 'telegram-bot', 'body': body}, 5)
+        queues.set_task('botalka_mailbox', {'project': 'ruz-bot', 'name': 'telegram-bot', 'body': body}, 1)
 
     def set_state(self, state: str):
         self.user['state'] = state

helpers/ruz.py

@@ -12,8 +12,7 @@ fields = [
     'date_start',
     'date_end',
     'lecturer_profiles',
-    'stream_links',
+    'stream_links'
-    'type',
 ]