From 3fe47296a92427b25dab3ea922c5d80bb55772a4 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Thu, 1 Feb 2024 10:02:52 -0700 Subject: [PATCH 1/9] Update run.sh --- src/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/run.sh b/src/run.sh index 487c54591..d8dabe0cf 100755 --- a/src/run.sh +++ b/src/run.sh @@ -6,4 +6,4 @@ set -o pipefail # Make sure that django's `collectstatic` has been run locally before pushing up to any environment, # so that the styles and static assets to show up correctly on any environment. -gunicorn registrar.config.wsgi -t 60 +gunicorn --worker-class=gevent --worker-connections=1000 --workers=3 registrar.config.wsgi -t 60 From cfc9a2d1695c2c6c65920225bef4ac7a52daeb72 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Thu, 1 Feb 2024 11:55:35 -0700 Subject: [PATCH 2/9] Test one worker --- src/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/run.sh b/src/run.sh index d8dabe0cf..e7512b28d 100755 --- a/src/run.sh +++ b/src/run.sh @@ -6,4 +6,4 @@ set -o pipefail # Make sure that django's `collectstatic` has been run locally before pushing up to any environment, # so that the styles and static assets to show up correctly on any environment. -gunicorn --worker-class=gevent --worker-connections=1000 --workers=3 registrar.config.wsgi -t 60 +gunicorn --worker-class=gevent --worker-connections=1000 --workers=1 registrar.config.wsgi -t 60 From 0653ee838512cbdaa0971deed6061c5dd1a9355b Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Thu, 1 Feb 2024 12:09:51 -0700 Subject: [PATCH 3/9] Add sleep to mimic --- src/registrar/views/domain.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index 313762ef1..48d537562 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -6,7 +6,7 @@ """ import logging - +import time from django.contrib import messages from django.contrib.messages.views import SuccessMessageMixin from django.db import IntegrityError @@ -150,6 +150,7 @@ def get_context_data(self, **kwargs): context["security_email"] = None return context context["security_email"] = security_email + time.sleep(100) return context def in_editable_state(self, pk): From 6108052c2568565d0fd6244202acb81f85e04e42 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Thu, 1 Feb 2024 16:10:10 -0700 Subject: [PATCH 4/9] Revert "Add sleep to mimic" This reverts commit 0653ee838512cbdaa0971deed6061c5dd1a9355b. --- src/registrar/views/domain.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index 48d537562..313762ef1 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -6,7 +6,7 @@ """ import logging -import time + from django.contrib import messages from django.contrib.messages.views import SuccessMessageMixin from django.db import IntegrityError @@ -150,7 +150,6 @@ def get_context_data(self, **kwargs): context["security_email"] = None return context context["security_email"] = security_email - time.sleep(100) return context def in_editable_state(self, pk): From af222157211863166fb1563f1d709441b8042462 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Thu, 1 Feb 2024 16:19:55 -0700 Subject: [PATCH 5/9] Revert "Revert "Add sleep to mimic"" This reverts commit 6108052c2568565d0fd6244202acb81f85e04e42. --- src/registrar/views/domain.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index 313762ef1..48d537562 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -6,7 +6,7 @@ """ import logging - +import time from django.contrib import messages from django.contrib.messages.views import SuccessMessageMixin from django.db import IntegrityError @@ -150,6 +150,7 @@ def get_context_data(self, **kwargs): context["security_email"] = None return context context["security_email"] = security_email + time.sleep(100) return context def in_editable_state(self, pk): From 2c3efb4cbce24696f069a5f4034789f0b9c11084 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Thu, 1 Feb 2024 16:20:22 -0700 Subject: [PATCH 6/9] Change manifest health check --- ops/manifests/manifest-za.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ops/manifests/manifest-za.yaml b/ops/manifests/manifest-za.yaml index 271f49da9..54cdc0262 100644 --- a/ops/manifests/manifest-za.yaml +++ b/ops/manifests/manifest-za.yaml @@ -11,7 +11,7 @@ applications: command: ./run.sh health-check-type: http health-check-http-endpoint: /health - health-check-invocation-timeout: 40 + health-check-invocation-timeout: 1 env: # Send stdout and stderr straight to the terminal without buffering PYTHONUNBUFFERED: yup From 09b0ebb8922f9c0a28326b169d18a6deffcb8652 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Tue, 6 Feb 2024 10:13:00 -0700 Subject: [PATCH 7/9] Revert "Change manifest health check" This reverts commit 2c3efb4cbce24696f069a5f4034789f0b9c11084. --- ops/manifests/manifest-za.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ops/manifests/manifest-za.yaml b/ops/manifests/manifest-za.yaml index 54cdc0262..271f49da9 100644 --- a/ops/manifests/manifest-za.yaml +++ b/ops/manifests/manifest-za.yaml @@ -11,7 +11,7 @@ applications: command: ./run.sh health-check-type: http health-check-http-endpoint: /health - health-check-invocation-timeout: 1 + health-check-invocation-timeout: 40 env: # Send stdout and stderr straight to the terminal without buffering PYTHONUNBUFFERED: yup From 18cc0e578e9b7892133c124d17c78aaaf42b541c Mon Sep 17 00:00:00 2001 From: Alysia Broddrick Date: Tue, 6 Feb 2024 13:22:08 -0800 Subject: [PATCH 8/9] limit changes to just gevent --- src/registrar/views/domain.py | 2 -- src/run.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index 48d537562..094ad86da 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -6,7 +6,6 @@ """ import logging -import time from django.contrib import messages from django.contrib.messages.views import SuccessMessageMixin from django.db import IntegrityError @@ -150,7 +149,6 @@ def get_context_data(self, **kwargs): context["security_email"] = None return context context["security_email"] = security_email - time.sleep(100) return context def in_editable_state(self, pk): diff --git a/src/run.sh b/src/run.sh index e7512b28d..04987c154 100755 --- a/src/run.sh +++ b/src/run.sh @@ -6,4 +6,4 @@ set -o pipefail # Make sure that django's `collectstatic` has been run locally before pushing up to any environment, # so that the styles and static assets to show up correctly on any environment. -gunicorn --worker-class=gevent --worker-connections=1000 --workers=1 registrar.config.wsgi -t 60 +gunicorn --worker-class=gevent registrar.config.wsgi -t 60 \ No newline at end of file From 239b704a920696b9f96f89bd4a9cd9a3ae8d51d5 Mon Sep 17 00:00:00 2001 From: Alysia Broddrick Date: Tue, 6 Feb 2024 13:40:11 -0800 Subject: [PATCH 9/9] fixed newlines --- src/registrar/views/domain.py | 1 + src/run.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index 094ad86da..313762ef1 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -6,6 +6,7 @@ """ import logging + from django.contrib import messages from django.contrib.messages.views import SuccessMessageMixin from django.db import IntegrityError diff --git a/src/run.sh b/src/run.sh index 04987c154..1d35cd617 100755 --- a/src/run.sh +++ b/src/run.sh @@ -6,4 +6,4 @@ set -o pipefail # Make sure that django's `collectstatic` has been run locally before pushing up to any environment, # so that the styles and static assets to show up correctly on any environment. -gunicorn --worker-class=gevent registrar.config.wsgi -t 60 \ No newline at end of file +gunicorn --worker-class=gevent registrar.config.wsgi -t 60