# HG changeset patch # User drewp@bigasterisk.com # Date 1668906430 28800 # Node ID 94181d521d6ddf3b88bd6d520cd489638ea89686 # Parent c538dc39b8513c63c2bea30a7fdb95c5da494ddc prometheus, longer page title timeout, dead code, etc diff -r c538dc39b851 -r 94181d521d6d lookup.py --- a/lookup.py Sat Nov 19 17:06:36 2022 -0800 +++ b/lookup.py Sat Nov 19 17:07:10 2022 -0800 @@ -20,6 +20,8 @@ import pymongo from bottle import static_file from dateutil.tz import tzlocal +from prometheus_client.exposition import generate_latest +from prometheus_client.registry import REGISTRY from jadestache import Renderer from link import Links, NotFound @@ -30,9 +32,9 @@ pageTitle = PageTitle(db) links = Links(db) renderer = Renderer(search_dirs=['template'], debug=bottle.DEBUG) +logging.basicConfig(level=logging.DEBUG) log = logging.getLogger() - def getUser(): try: agent = bottleGetAgent() @@ -43,12 +45,8 @@ def siteRoot(): - try: - return bottle.request.headers['x-site-root'].rstrip('/') - except KeyError: - log.warn(repr(bottle.request.__dict__)) - raise - + return 'https://bigasterisk.com/href' + @bottle.route('/static/') def server_static(path): @@ -223,7 +221,8 @@ @bottle.route('/metrics') def metrics(): - return '' + bottle.response.content_type = "text/plain" + return generate_latest(REGISTRY) @bottle.route('/') diff -r c538dc39b851 -r 94181d521d6d pagetitle.py --- a/pagetitle.py Sat Nov 19 17:06:36 2022 -0800 +++ b/pagetitle.py Sat Nov 19 17:07:10 2022 -0800 @@ -17,7 +17,7 @@ try: response = requests.get( uri, - timeout=1, + timeout=3, allow_redirects=True, headers={ 'user-agent': 'link title checker - drewp@bigasterisk.com' diff -r c538dc39b851 -r 94181d521d6d tasks.py --- a/tasks.py Sat Nov 19 17:06:36 2022 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -from invoke import task, Collection - -import sys -sys.path.append('/my/proj/release') -from serv_tasks import serv_tasks, dockerCommand -ns = Collection() -serv_tasks(ns, 'serv.n3', 'href')