From 337a6b95ab387b1c0bbf1e33721dab926fc48165 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 23 Nov 2018 01:57:25 +0300 Subject: [PATCH 1/9] flower --- docker/conf/nginx/conf.d/default.conf | 21 +++++++++++++++++++++ docker/conf/supervisor/flower.conf | 14 ++++++++++++++ docker/docker-compose-review.yml | 2 +- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 docker/conf/supervisor/flower.conf diff --git a/docker/conf/nginx/conf.d/default.conf b/docker/conf/nginx/conf.d/default.conf index b20174f6..f78513ae 100644 --- a/docker/conf/nginx/conf.d/default.conf +++ b/docker/conf/nginx/conf.d/default.conf @@ -1,3 +1,24 @@ +server { + listen 80; + server_name ~^flower.+; + + root /dev/null; + + access_log off; + error_log /dev/stdout; + + log_not_found off; + + location / { + proxy_pass http://127.0.0.1:5555; + proxy_set_header Host $host; + proxy_redirect off; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } +} + server { listen 80 default_server; diff --git a/docker/conf/supervisor/flower.conf b/docker/conf/supervisor/flower.conf new file mode 100644 index 00000000..0d4bee32 --- /dev/null +++ b/docker/conf/supervisor/flower.conf @@ -0,0 +1,14 @@ +[program:celery] +command=/usr/local/bin/flower --config=settings --address=0.0.0.0 +directory=/app/ +environment=HOME="/var/www" +autostart=true +autorestart=true +user=www-data +redirect_stderr=true +stopsignal=KILL +stopasgroup=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stdout +stderr_logfile_maxbytes=0 diff --git a/docker/docker-compose-review.yml b/docker/docker-compose-review.yml index 9413f978..69540427 100644 --- a/docker/docker-compose-review.yml +++ b/docker/docker-compose-review.yml @@ -48,7 +48,7 @@ services: - internal - review labels: - - traefik.frontend.rule=Host:${REVIEW_HOST} + - traefik.frontend.rule=Host:${REVIEW_HOST},flower-${REVIEW_HOST} - traefik.docker.network=review networks: From 53994f97972c4d4f4df4869f1e8454d6fa1def4d Mon Sep 17 00:00:00 2001 From: root Date: Fri, 23 Nov 2018 02:03:33 +0300 Subject: [PATCH 2/9] flower --- docker/conf/supervisor/flower.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/conf/supervisor/flower.conf b/docker/conf/supervisor/flower.conf index 0d4bee32..1d8c2912 100644 --- a/docker/conf/supervisor/flower.conf +++ b/docker/conf/supervisor/flower.conf @@ -1,4 +1,4 @@ -[program:celery] +[program:flower] command=/usr/local/bin/flower --config=settings --address=0.0.0.0 directory=/app/ environment=HOME="/var/www" From 0414f8a8b0211cbb6944ca8b8279b5ca03c896be Mon Sep 17 00:00:00 2001 From: root Date: Fri, 23 Nov 2018 02:11:03 +0300 Subject: [PATCH 3/9] flower --- docker/conf/supervisor/flower.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/conf/supervisor/flower.conf b/docker/conf/supervisor/flower.conf index 1d8c2912..d89b494d 100644 --- a/docker/conf/supervisor/flower.conf +++ b/docker/conf/supervisor/flower.conf @@ -1,5 +1,5 @@ [program:flower] -command=/usr/local/bin/flower --config=settings --address=0.0.0.0 +command=/usr/local/bin/flower -A project directory=/app/ environment=HOME="/var/www" autostart=true From 7d0ad235ef99ede0d9beb159738d70990319c4f2 Mon Sep 17 00:00:00 2001 From: nikita Date: Fri, 23 Nov 2018 11:05:32 +0300 Subject: [PATCH 4/9] command fixes --- .../management/commands/send_transactions_to_roistat.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/payment/management/commands/send_transactions_to_roistat.py b/apps/payment/management/commands/send_transactions_to_roistat.py index f82d2313..af53c7ee 100644 --- a/apps/payment/management/commands/send_transactions_to_roistat.py +++ b/apps/payment/management/commands/send_transactions_to_roistat.py @@ -5,6 +5,9 @@ from paymentwall.pingback import Pingback from apps.payment.tasks import transaction_to_roistat from apps.payment.models import Payment +import logging +logger = logging.getLogger(__name__) + class Command(BaseCommand): help = 'Send ' @@ -19,10 +22,12 @@ class Command(BaseCommand): start_id = options.get('start_id') payments = Payment.objects.filter(id__gte=start_id, status__in=Payment.PW_PAID_STATUSES) for payment in payments: + logger.info('TRANSACTION: ' + payment.id) + pingback = Pingback(payment.data) splitted = pingback.get_product().get_id().split('_') product_type_name, payment_id = '_'.join(splitted[:-1]), splitted[-1] - transaction_to_roistat.delay( + transaction_to_roistat( payment.user.id, payment.id, f'{product_type_name.title()} payment', From 1fb48607e902481b4fd53cacef9dec2c81f5da2d Mon Sep 17 00:00:00 2001 From: nikita Date: Fri, 23 Nov 2018 11:07:50 +0300 Subject: [PATCH 5/9] command fixes --- .../payment/management/commands/send_transactions_to_roistat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/payment/management/commands/send_transactions_to_roistat.py b/apps/payment/management/commands/send_transactions_to_roistat.py index af53c7ee..3db2e864 100644 --- a/apps/payment/management/commands/send_transactions_to_roistat.py +++ b/apps/payment/management/commands/send_transactions_to_roistat.py @@ -22,7 +22,7 @@ class Command(BaseCommand): start_id = options.get('start_id') payments = Payment.objects.filter(id__gte=start_id, status__in=Payment.PW_PAID_STATUSES) for payment in payments: - logger.info('TRANSACTION: ' + payment.id) + logger.info('TRANSACTION: ' + str(payment.id)) pingback = Pingback(payment.data) splitted = pingback.get_product().get_id().split('_') From 296d988d08b4642aa5ae6e3dbc32da14a6bf6837 Mon Sep 17 00:00:00 2001 From: nikita Date: Fri, 23 Nov 2018 11:27:05 +0300 Subject: [PATCH 6/9] command fixes --- .../management/commands/send_transactions_to_roistat.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/apps/payment/management/commands/send_transactions_to_roistat.py b/apps/payment/management/commands/send_transactions_to_roistat.py index 3db2e864..cd5ab662 100644 --- a/apps/payment/management/commands/send_transactions_to_roistat.py +++ b/apps/payment/management/commands/send_transactions_to_roistat.py @@ -24,16 +24,13 @@ class Command(BaseCommand): for payment in payments: logger.info('TRANSACTION: ' + str(payment.id)) - pingback = Pingback(payment.data) - splitted = pingback.get_product().get_id().split('_') - product_type_name, payment_id = '_'.join(splitted[:-1]), splitted[-1] transaction_to_roistat( payment.user.id, payment.id, - f'{product_type_name.title()} payment', + f'Payment {payment.id}', payment.amount, payment.update_at.strftime('%Y-%m-%d %H:%M:%S'), - pingback.get_type(), - product_type_name, + 0, + f'Payment {payment.id}', payment.roistat_visit, ) From 2685f36e01d82fc2d22a100ea1f22ef896b4740d Mon Sep 17 00:00:00 2001 From: nikita Date: Fri, 23 Nov 2018 12:29:19 +0300 Subject: [PATCH 7/9] command fixes --- .../management/commands/send_transactions_to_roistat.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/payment/management/commands/send_transactions_to_roistat.py b/apps/payment/management/commands/send_transactions_to_roistat.py index cd5ab662..15a50e38 100644 --- a/apps/payment/management/commands/send_transactions_to_roistat.py +++ b/apps/payment/management/commands/send_transactions_to_roistat.py @@ -20,9 +20,11 @@ class Command(BaseCommand): def handle(self, *args, **options): start_id = options.get('start_id') + print('start_id=' + str(start_id)) + payments = Payment.objects.filter(id__gte=start_id, status__in=Payment.PW_PAID_STATUSES) for payment in payments: - logger.info('TRANSACTION: ' + str(payment.id)) + print('TRANSACTION: ' + str(payment.id)) transaction_to_roistat( payment.user.id, From 9d7955f97dd6c10db10b391fc05a854ea7a069da Mon Sep 17 00:00:00 2001 From: nikita Date: Fri, 23 Nov 2018 12:36:27 +0300 Subject: [PATCH 8/9] command fixes --- .../management/commands/send_transactions_to_roistat.py | 3 ++- apps/payment/tasks.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/payment/management/commands/send_transactions_to_roistat.py b/apps/payment/management/commands/send_transactions_to_roistat.py index 15a50e38..14ee6ee6 100644 --- a/apps/payment/management/commands/send_transactions_to_roistat.py +++ b/apps/payment/management/commands/send_transactions_to_roistat.py @@ -26,7 +26,7 @@ class Command(BaseCommand): for payment in payments: print('TRANSACTION: ' + str(payment.id)) - transaction_to_roistat( + result = transaction_to_roistat( payment.user.id, payment.id, f'Payment {payment.id}', @@ -36,3 +36,4 @@ class Command(BaseCommand): f'Payment {payment.id}', payment.roistat_visit, ) + print('RESULT' + str(result)) diff --git a/apps/payment/tasks.py b/apps/payment/tasks.py index e30f4e19..3b15a50f 100644 --- a/apps/payment/tasks.py +++ b/apps/payment/tasks.py @@ -56,3 +56,5 @@ def transaction_to_roistat(user_id, payment_id, event_name, amount, time, status url = settings.ROISTAT_API_URL + f'/project/add-orders?key={key}&project={project}' resp = requests.post(url, json=body) logger.info('TRANSACTION_TO_ROISTAT: ' + str(resp)) + + return resp From 4002617cca1fb2e67b9faedd33318adfb044020c Mon Sep 17 00:00:00 2001 From: nikita Date: Fri, 23 Nov 2018 12:42:28 +0300 Subject: [PATCH 9/9] command fixes --- .../payment/management/commands/send_transactions_to_roistat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/payment/management/commands/send_transactions_to_roistat.py b/apps/payment/management/commands/send_transactions_to_roistat.py index 14ee6ee6..6b47ab32 100644 --- a/apps/payment/management/commands/send_transactions_to_roistat.py +++ b/apps/payment/management/commands/send_transactions_to_roistat.py @@ -32,7 +32,7 @@ class Command(BaseCommand): f'Payment {payment.id}', payment.amount, payment.update_at.strftime('%Y-%m-%d %H:%M:%S'), - 0, + f'PINGBACK_TYPE_REGULAR', f'Payment {payment.id}', payment.roistat_visit, )