From c0fe6c2961b70dfc9dab8cd3d353603c75309e29 Mon Sep 17 00:00:00 2001 From: Ben Bright Date: Thu, 11 Jan 2024 19:32:12 +0000 Subject: [PATCH 1/4] Experimenting with uWSGI flags https://www.bloomberg.com/company/stories/configuring-uwsgi-production-deployment/ --- docker/ckan/setup/app/start_ckan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/ckan/setup/app/start_ckan.sh b/docker/ckan/setup/app/start_ckan.sh index fee6dad..10f15d0 100755 --- a/docker/ckan/setup/app/start_ckan.sh +++ b/docker/ckan/setup/app/start_ckan.sh @@ -13,7 +13,7 @@ then fi # Set the common uwsgi options -UWSGI_OPTS="--socket /tmp/uwsgi.sock --uid ckan --gid ckan --http :5000 --master --enable-threads --wsgi-file /srv/app/wsgi.py --module wsgi:application --lazy-apps --gevent 2000 -p 2 -L --gevent-early-monkey-patch --vacuum --harakiri 50 --callable application" +UWSGI_OPTS="--socket /tmp/uwsgi.sock --uid ckan --gid ckan --http :5000 --master --enable-threads --wsgi-file /srv/app/wsgi.py --module wsgi:application --lazy-apps --gevent 2000 -p 2 -L --gevent-early-monkey-patch --vacuum --harakiri 50 --callable application --single-interpreter --need-app --disable-logging --log-4xx --log-5xx" # Run the prerun script to init CKAN and create the default admin user python prerun.py || { echo '[CKAN prerun] FAILED. Exiting...' ; exit 1; } From 45128f15a6eca73248cead227f2d4a03181dd89a Mon Sep 17 00:00:00 2001 From: Ben Bright Date: Thu, 11 Jan 2024 19:54:20 +0000 Subject: [PATCH 2/4] twdh_schema and datatablesview_plus set to branch bb-dev --- docker/ckan/plugins/ckan_plugins.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/ckan/plugins/ckan_plugins.json b/docker/ckan/plugins/ckan_plugins.json index 211d6da..73737bc 100644 --- a/docker/ckan/plugins/ckan_plugins.json +++ b/docker/ckan/plugins/ckan_plugins.json @@ -14,8 +14,8 @@ { "owner": "TNRIS", "repo": "ckanext-twdh_schema", - "tag": "TWDHv0.5.0.rc1", - "branch": "", + "tag": "", + "branch": "bb-dev", "cmd": ["pip install -e .", "pip install -r requirements.txt"] }, { @@ -88,8 +88,8 @@ { "owner": "TNRIS", "repo": "ckanext-datatablesview_plus", - "tag": "TWDHv0.5.0.rc3", - "branch": "", + "tag": "", + "branch": "bb-dev", "cmd": [ "python setup.py install", "pip install botocore==1.27.29", From c0102a4b4ce10587ff03c6148c5ddeae58db8ec5 Mon Sep 17 00:00:00 2001 From: Ben Bright Date: Thu, 11 Jan 2024 20:32:55 +0000 Subject: [PATCH 3/4] Added --log-slow 5000 to UWSGI_OPTS --- docker/ckan/setup/app/start_ckan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/ckan/setup/app/start_ckan.sh b/docker/ckan/setup/app/start_ckan.sh index 10f15d0..1944e2b 100755 --- a/docker/ckan/setup/app/start_ckan.sh +++ b/docker/ckan/setup/app/start_ckan.sh @@ -13,7 +13,7 @@ then fi # Set the common uwsgi options -UWSGI_OPTS="--socket /tmp/uwsgi.sock --uid ckan --gid ckan --http :5000 --master --enable-threads --wsgi-file /srv/app/wsgi.py --module wsgi:application --lazy-apps --gevent 2000 -p 2 -L --gevent-early-monkey-patch --vacuum --harakiri 50 --callable application --single-interpreter --need-app --disable-logging --log-4xx --log-5xx" +UWSGI_OPTS="--socket /tmp/uwsgi.sock --uid ckan --gid ckan --http :5000 --master --enable-threads --wsgi-file /srv/app/wsgi.py --module wsgi:application --lazy-apps --gevent 2000 -p 2 -L --gevent-early-monkey-patch --vacuum --harakiri 50 --callable application --single-interpreter --need-app --disable-logging --log-4xx --log-5xx --log-slow 5000" # Run the prerun script to init CKAN and create the default admin user python prerun.py || { echo '[CKAN prerun] FAILED. Exiting...' ; exit 1; } From 73d7f76f19220d9ff3a8785b3c10a1e4bb86a07b Mon Sep 17 00:00:00 2001 From: Ben Bright Date: Fri, 12 Jan 2024 18:40:21 +0000 Subject: [PATCH 4/4] Set TWDHv0.5.1.rc1 tags in ckan_plugins.json --- docker/ckan/plugins/ckan_plugins.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/ckan/plugins/ckan_plugins.json b/docker/ckan/plugins/ckan_plugins.json index 73737bc..c0b4fcf 100644 --- a/docker/ckan/plugins/ckan_plugins.json +++ b/docker/ckan/plugins/ckan_plugins.json @@ -3,7 +3,7 @@ { "owner": "TNRIS", "repo": "ckanext-twdh_theme", - "tag": "TWDHv0.5.0.rc2", + "tag": "TWDHv0.5.1.rc1", "branch": "", "cmd": [ "pip install -e .", @@ -14,8 +14,8 @@ { "owner": "TNRIS", "repo": "ckanext-twdh_schema", - "tag": "", - "branch": "bb-dev", + "tag": "TWDHv0.5.1.rc1", + "branch": "", "cmd": ["pip install -e .", "pip install -r requirements.txt"] }, { @@ -88,8 +88,8 @@ { "owner": "TNRIS", "repo": "ckanext-datatablesview_plus", - "tag": "", - "branch": "bb-dev", + "tag": "TWDHv0.5.1.rc1", + "branch": "", "cmd": [ "python setup.py install", "pip install botocore==1.27.29",