From 20db40c362994be111a39a9540eebcbf4ea3a2e5 Mon Sep 17 00:00:00 2001 From: denghy Date: Thu, 24 Jan 2019 15:04:34 +0800 Subject: [PATCH] w --- .../create_virtaul_order_cards_func.pgsql | 18 +++++++++++++++++ etc/supervisor.conf | 20 ++++++++++++++++--- tests/ExampleTest.php | 2 +- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/database/migrations/create_virtaul_order_cards_func.pgsql b/database/migrations/create_virtaul_order_cards_func.pgsql index 5b959fc5..804278bb 100644 --- a/database/migrations/create_virtaul_order_cards_func.pgsql +++ b/database/migrations/create_virtaul_order_cards_func.pgsql @@ -160,3 +160,21 @@ BEGIN END; $$ LANGUAGE plpgsql IMMUTABLE; + +CREATE OR REPLACE FUNCTION FIX_ORDER_COUNTS () + RETURNS BOOLEAN +AS $$ +BEGIN + UPDATE virtual_orders SET counts = COALESCE ( + ( + SELECT COUNT( * ) + FROM virtual_order_cards_partition + WHERE virtual_order_cards_partition."type" = virtual_orders."type" + AND virtual_order_cards_partition.order_id = virtual_orders."id" + GROUP BY "type",order_id + ), 0); + + RETURN TRUE; +END; +$$ +LANGUAGE plpgsql; diff --git a/etc/supervisor.conf b/etc/supervisor.conf index 22b18bd1..7d0abbde 100644 --- a/etc/supervisor.conf +++ b/etc/supervisor.conf @@ -1,11 +1,25 @@ -[program:vd-worker] +[program:vd-worker-default] process_name=%(program_name)s_%(process_num)02d -command=php /www/vd/artisan queue:work --queue=default,sync --memory=4096 +command=php /www/vd/artisan queue:work --queue=default --memory=4096 --tries=3 autostart=true autorestart=true user=www -numprocs=2 +numprocs=3 redirect_stderr=true stdout_logfile = /var/log/vd-queue.log stderr_logfile_maxbytes=1MB stdout_logfile_maxbytes=1MB + +[program:vd-worker-sync] +process_name=%(program_name)s_%(process_num)02d +command=php /www/vd/artisan queue:work --queue=sync --memory=4096 --tries=3 --timeout=600 +autostart=true +autorestart=true +user=www +numprocs=3 +redirect_stderr=true +stdout_logfile = /var/log/vd-queue.log +stderr_logfile_maxbytes=1MB +stdout_logfile_maxbytes=1MB + + diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php index f11d2843..af1222e2 100644 --- a/tests/ExampleTest.php +++ b/tests/ExampleTest.php @@ -1,3 +1,3 @@