diff --git a/SprintLib/queue.py b/SprintLib/queue.py index c7a8fbd..2a8c8c5 100644 --- a/SprintLib/queue.py +++ b/SprintLib/queue.py @@ -1,3 +1,7 @@ +import json +from enum import Enum, auto +from typing import Union + import pika from Sprint import settings @@ -16,3 +20,45 @@ def send_testing(solution): routing_key="test", body=bytes(str(solution.id), encoding="utf-8"), ) + + +class Queue(str, Enum): + test = auto() + notification = auto() + + +class QueueAccessor: + + def publish(self, queue: Union[Queue, str], message: Union[bytes, dict]): + if isinstance(message, dict): + message = json.dumps(message).encode("UTF-8") + if isinstance(queue, str): + queue = Queue(queue) + with pika.BlockingConnection( + pika.ConnectionParameters(host=settings.RABBIT_HOST, port=settings.RABBIT_PORT) + ) as connection: + channel = connection.channel() + channel.queue_declare(queue=queue.name) + channel.basic_publish( + exchange="", + routing_key=queue.name, + body=message, + ) + + +def message_handler(queue: Union[Queue, str]): + if isinstance(queue, str): + queue = Queue(queue) + + def decorator(func): + def new_func(*args, **kwargs): + print("Enter listener for queue", queue) + with pika.BlockingConnection( + pika.ConnectionParameters(host=settings.RABBIT_HOST) + ) as connection: + channel = connection.channel() + channel.queue_declare(queue=queue.name) + channel.basic_consume(queue=queue.name, on_message_callback=func, auto_ack=True) + channel.start_consuming() + return new_func + return decorator diff --git a/docker-compose-deploy.yaml b/docker-compose-deploy.yaml index 607a8d8..715884f 100644 --- a/docker-compose-deploy.yaml +++ b/docker-compose-deploy.yaml @@ -4,13 +4,14 @@ version: "3" services: postgres: - image: local_postgres + image: postgres environment: POSTGRES_USER: postgres POSTGRES_PASSWORD: $DB_PASSWORD POSTGRES_DB: sprint volumes: - /sprint-data/postgres-data:/var/lib/postgresql/data + - ./pg_hba.conf:/var/lib/postgresql/data/pg_hba.conf ports: - "5432:5432" deploy: @@ -120,7 +121,7 @@ services: condition: on-failure rabbitmq: - image: local_rabbitmq + image: rabbitmq:3.7.9-management ports: - "15672:15672" - "5672:5672" diff --git a/dockerfiles/postgres/Dockerfile b/dockerfiles/postgres/Dockerfile deleted file mode 100644 index 4759f46..0000000 --- a/dockerfiles/postgres/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM postgres -COPY pg_hba.conf /var/lib/postgresql/data/pg_hba.conf diff --git a/dockerfiles/postgres/pg_hba.conf b/dockerfiles/postgres/pg_hba.conf deleted file mode 100644 index 2761624..0000000 --- a/dockerfiles/postgres/pg_hba.conf +++ /dev/null @@ -1,98 +0,0 @@ -# PostgreSQL Client Authentication Configuration File -# =================================================== -# -# Refer to the "Client Authentication" section in the PostgreSQL -# documentation for a complete description of this file. A short -# synopsis follows. -# -# This file controls: which hosts are allowed to connect, how clients -# are authenticated, which PostgreSQL user names they can use, which -# databases they can access. Records take one of these forms: -# -# local DATABASE USER METHOD [OPTIONS] -# host DATABASE USER ADDRESS METHOD [OPTIONS] -# hostssl DATABASE USER ADDRESS METHOD [OPTIONS] -# hostnossl DATABASE USER ADDRESS METHOD [OPTIONS] -# hostgssenc DATABASE USER ADDRESS METHOD [OPTIONS] -# hostnogssenc DATABASE USER ADDRESS METHOD [OPTIONS] -# -# (The uppercase items must be replaced by actual values.) -# -# The first field is the connection type: "local" is a Unix-domain -# socket, "host" is either a plain or SSL-encrypted TCP/IP socket, -# "hostssl" is an SSL-encrypted TCP/IP socket, and "hostnossl" is a -# non-SSL TCP/IP socket. Similarly, "hostgssenc" uses a -# GSSAPI-encrypted TCP/IP socket, while "hostnogssenc" uses a -# non-GSSAPI socket. -# -# DATABASE can be "all", "sameuser", "samerole", "replication", a -# database name, or a comma-separated list thereof. The "all" -# keyword does not match "replication". Access to replication -# must be enabled in a separate record (see example below). -# -# USER can be "all", a user name, a group name prefixed with "+", or a -# comma-separated list thereof. In both the DATABASE and USER fields -# you can also write a file name prefixed with "@" to include names -# from a separate file. -# -# ADDRESS specifies the set of hosts the record matches. It can be a -# host name, or it is made up of an IP address and a CIDR mask that is -# an integer (between 0 and 32 (IPv4) or 128 (IPv6) inclusive) that -# specifies the number of significant bits in the mask. A host name -# that starts with a dot (.) matches a suffix of the actual host name. -# Alternatively, you can write an IP address and netmask in separate -# columns to specify the set of hosts. Instead of a CIDR-address, you -# can write "samehost" to match any of the server's own IP addresses, -# or "samenet" to match any address in any subnet that the server is -# directly connected to. -# -# METHOD can be "trust", "reject", "md5", "password", "scram-sha-256", -# "gss", "sspi", "ident", "peer", "pam", "ldap", "radius" or "cert". -# Note that "password" sends passwords in clear text; "md5" or -# "scram-sha-256" are preferred since they send encrypted passwords. -# -# OPTIONS are a set of options for the authentication in the format -# NAME=VALUE. The available options depend on the different -# authentication methods -- refer to the "Client Authentication" -# section in the documentation for a list of which options are -# available for which authentication methods. -# -# Database and user names containing spaces, commas, quotes and other -# special characters must be quoted. Quoting one of the keywords -# "all", "sameuser", "samerole" or "replication" makes the name lose -# its special character, and just match a database or username with -# that name. -# -# This file is read on server startup and when the server receives a -# SIGHUP signal. If you edit the file on a running system, you have to -# SIGHUP the server for the changes to take effect, run "pg_ctl reload", -# or execute "SELECT pg_reload_conf()". -# -# Put your actual configuration here -# ---------------------------------- -# -# If you want to allow non-local connections, you need to add more -# "host" records. In that case you will also need to make PostgreSQL -# listen on a non-local interface via the listen_addresses -# configuration parameter, or via the -i or -h command line switches. - -# CAUTION: Configuring the system for local "trust" authentication -# allows any local user to connect as any PostgreSQL user, including -# the database superuser. If you do not trust all your local users, -# use another authentication method. - - -# TYPE DATABASE USER ADDRESS METHOD - -# "local" is for Unix domain socket connections only -local all all trust -# IPv4 local connections: -host all all 127.0.0.1/32 trust -# IPv6 local connections: -host all all ::1/128 trust -# Allow replication connections from localhost, by a user with the -# replication privilege. -local replication all trust -host replication all 127.0.0.1/32 trust -host replication all ::1/128 trust -host all all 0.0.0.0/0 trust \ No newline at end of file diff --git a/dockerfiles/rabbitmq/Dockerfile b/dockerfiles/rabbitmq/Dockerfile deleted file mode 100644 index 4e2f27d..0000000 --- a/dockerfiles/rabbitmq/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM rabbitmq:3.7.9-management -RUN rabbitmq-plugins enable rabbitmq_consistent_hash_exchange diff --git a/dockerfiles/sprint/Dockerfile b/dockerfiles/sprint/Dockerfile deleted file mode 100644 index 129c50e..0000000 --- a/dockerfiles/sprint/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM docker:dind - -RUN apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python -RUN python3 -m ensurepip -RUN apk update && apk add postgresql-dev gcc python3-dev musl-dev jpeg-dev zlib-dev libjpeg -RUN pip3 install --no-cache --upgrade pip setuptools - -ENV PYTHONUNBUFFERED 1 -ENV DJANGO_SETTINGS_MODULE Sprint.settings -RUN mkdir -p /usr/src/app/ -WORKDIR /usr/src/app/ - -COPY ../.. /usr/src/app/ - -RUN pip3 install -r requirements.txt - -EXPOSE 8000 diff --git a/solutions/48/1 b/solutions/48/1 deleted file mode 100644 index d0b76ca..0000000 --- a/solutions/48/1 +++ /dev/null @@ -1,2 +0,0 @@ -1 2 3 4 5 -4 \ No newline at end of file diff --git a/solutions/48/1.a b/solutions/48/1.a deleted file mode 100644 index e440e5c..0000000 --- a/solutions/48/1.a +++ /dev/null @@ -1 +0,0 @@ -3 \ No newline at end of file diff --git a/solutions/48/solution.py b/solutions/48/solution.py deleted file mode 100644 index 615fe87..0000000 --- a/solutions/48/solution.py +++ /dev/null @@ -1,3 +0,0 @@ -l = list(map(int, input().split())) -n = int(input()) -print(l.index(n)) \ No newline at end of file