Merge pull request #2788 from GSA/undo-recent-changes

Undo recent changes related to Python upgrade

Makefile

@@ -42,7 +42,7 @@ watch-frontend:  ## Build frontend and watch for changes
 
 .PHONY: run-flask
 run-flask:  ## Run flask
-	poetry run flask run -p 6012 --host=0.0.0.0
+	poetry run newrelic-admin run-program flask run -p 6012 --host=0.0.0.0
 
 .PHONY: run-flask-bare
 run-flask-bare:  ## Run flask without invoking poetry so we can override ENV variables in .env

gunicorn_config.py

@@ -10,7 +10,7 @@ import gunicorn
 # but we have an unusual configuration with a lot of cpus and not much memory
 # so adjust it.
 workers = multiprocessing.cpu_count()
-worker_class = "sync"
+worker_class = "gevent"
 bind = "0.0.0.0:{}".format(os.getenv("PORT"))
 disable_redirect_access_to_syslog = True
 gunicorn.SERVER_SOFTWARE = "None"

gunicorn_entry.py

@@ -1,10 +1,5 @@
-# from gevent import monkey
+from gevent import monkey
 
-# monkey.patch_all()
-
-
-import newrelic.agent  # noqa
-
-newrelic.agent.initialize("./newrelic.ini")
+monkey.patch_all()
 
 from application import application  # noqa