Remove talisker request

canonical · Dec 11, 2023 · 9c1148f · 9c1148f
1 parent e222399
commit 9c1148f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -72,3 +72,6 @@ bower_components/
 
 build/
 dist/
+
+# Local development
+canonicalwebteam.flask-base/
diff --git a/entrypoint b/entrypoint
@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 
 set -e
-RUN_COMMAND="talisker.gunicorn.gevent webapp.app:app --bind $1 --worker-class gevent --name talisker-`hostname`"
+RUN_COMMAND="gunicorn webapp.app:app --bind $1"
 
 if [ "${FLASK_DEBUG}" = true ] || [ "${FLASK_DEBUG}" = 1 ]; then
     RUN_COMMAND="${RUN_COMMAND} --reload --log-level debug --timeout 9999"

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
-canonicalwebteam.flask-base==1.1.0
+# canonicalwebteam.flask-base==1.1.0
+-e /home/ubuntu/dqlite-io/canonicalwebteam.flask-base
 canonicalwebteam.discourse==5.4.7
 canonicalwebteam.search==1.3.0
diff --git a/webapp/app.py b/webapp/app.py
@@ -1,5 +1,5 @@
 import os
-import talisker.requests
+import requests
 
 # Packages
 from canonicalwebteam.flask_base.app import FlaskBase
@@ -22,7 +22,7 @@
     template_404="404.html",
     template_500="500.html",
 )
-session = talisker.requests.get_session()
+session = requests.Session()
 
 docs_url_prefix = "/docs"
 discourse_docs = Docs(
@@ -71,4 +71,4 @@ def sitemap_links():
     response = make_response(xml_sitemap)
     response.headers["Content-Type"] = "application/xml"
 
-    return response
+    return response
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,3 +72,6 @@ bower_components/ @@
     build/
     dist/
+    # Local development
+    canonicalwebteam.flask-base/