From 8ec2fa08eaf15cd421ff7be6a5684184e1e368fa Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Sun, 1 May 2022 09:11:25 +0300 Subject: [PATCH] variables --- Sprint/settings.py | 8 ++++---- SprintLib/queue.py | 12 ++++++------ docker-compose-deploy.yaml | 39 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 10 deletions(-) diff --git a/Sprint/settings.py b/Sprint/settings.py index d294344..4ae38a2 100644 --- a/Sprint/settings.py +++ b/Sprint/settings.py @@ -86,8 +86,8 @@ DATABASES = { "ENGINE": "django.db.backends.postgresql_psycopg2", "NAME": "sprint", "USER": "postgres", - "PASSWORD": os.getenv("DB_PASSWORD"), - "HOST": os.getenv("DB_HOST", "postgres"), + "PASSWORD": os.getenv("DB_PASSWORD", "password"), + "HOST": os.getenv("DB_HOST", "127.0.0.1"), "PORT": 5432, } } @@ -143,10 +143,10 @@ for root in DATA_ROOT, EXTRA_FILES_ROOT: SOLUTIONS_ROOT = os.path.join(DATA_ROOT, "solutions") -RABBIT_HOST = os.getenv("RABBIT_HOST", "rabbitmq") +RABBIT_HOST = os.getenv("RABBIT_HOST", "127.0.0.1") RABBIT_PORT = 5672 -FS_HOST = "http://" + os.getenv("FS_HOST", "storage") +FS_HOST = "http://" + os.getenv("FS_HOST", "127.0.0.1") FS_PORT = 5555 # Authentication backends diff --git a/SprintLib/queue.py b/SprintLib/queue.py index 5d799a0..a123399 100644 --- a/SprintLib/queue.py +++ b/SprintLib/queue.py @@ -39,13 +39,13 @@ class MessagingSupport(BaseCommand): print("start listening " + self.queue_name) while True: try: - connection = pika.BlockingConnection( + with pika.BlockingConnection( pika.ConnectionParameters(host=settings.RABBIT_HOST) - ) - channel = connection.channel() - channel.queue_declare(queue=self.queue_name) - channel.basic_consume(queue=self.queue_name, on_message_callback=self.consume, auto_ack=True) - channel.start_consuming() + ) as connection: + channel = connection.channel() + channel.queue_declare(queue=self.queue_name) + channel.basic_consume(queue=self.queue_name, on_message_callback=self.consume, auto_ack=True) + channel.start_consuming() except AMQPConnectorException: print("connection to rabbit failed: reconnecting") diff --git a/docker-compose-deploy.yaml b/docker-compose-deploy.yaml index 4014864..85df67d 100644 --- a/docker-compose-deploy.yaml +++ b/docker-compose-deploy.yaml @@ -58,6 +58,9 @@ services: - net environment: SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" + DB_HOST: "postgres" + FS_HOST: "storage" + RABBIT_HOST: "rabbitmq" DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -72,6 +75,9 @@ services: - net environment: SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" + DB_HOST: "postgres" + FS_HOST: "storage" + RABBIT_HOST: "rabbitmq" DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -89,6 +95,9 @@ services: - net environment: SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" + DB_HOST: "postgres" + FS_HOST: "storage" + RABBIT_HOST: "rabbitmq" DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -109,6 +118,9 @@ services: networks: - net environment: + DB_HOST: "postgres" + FS_HOST: "storage" + RABBIT_HOST: "rabbitmq" DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -126,6 +138,9 @@ services: networks: - net environment: + DB_HOST: "postgres" + FS_HOST: "storage" + RABBIT_HOST: "rabbitmq" DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -145,6 +160,9 @@ services: command: ./manage.py storage environment: SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" + DB_HOST: "postgres" + FS_HOST: "storage" + RABBIT_HOST: "rabbitmq" DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -164,6 +182,9 @@ services: - net environment: SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" + DB_HOST: "postgres" + FS_HOST: "storage" + RABBIT_HOST: "rabbitmq" DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -182,6 +203,9 @@ services: - net environment: SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" + DB_HOST: "postgres" + FS_HOST: "storage" + RABBIT_HOST: "rabbitmq" DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -201,6 +225,9 @@ services: command: ./manage.py receive environment: SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" + DB_HOST: "postgres" + FS_HOST: "storage" + RABBIT_HOST: "rabbitmq" DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -222,6 +249,9 @@ services: - net command: ./manage.py docker_cleaner environment: + DB_HOST: "postgres" + FS_HOST: "storage" + RABBIT_HOST: "rabbitmq" DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -243,6 +273,9 @@ services: command: ./manage.py file_generator environment: SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" + DB_HOST: "postgres" + FS_HOST: "storage" + RABBIT_HOST: "rabbitmq" DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -262,6 +295,9 @@ services: command: ./manage.py notification_manager environment: SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" + DB_HOST: "postgres" + FS_HOST: "storage" + RABBIT_HOST: "rabbitmq" DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN @@ -281,6 +317,9 @@ services: command: ./manage.py apply_languages environment: SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" + DB_HOST: "postgres" + FS_HOST: "storage" + RABBIT_HOST: "rabbitmq" DB_PASSWORD: $DB_PASSWORD DEBUG: $DEBUG TELEGRAM_TOKEN: $TELEGRAM_TOKEN