From 150449a0cf46e9fb1863feb596ff2fdad00b104e Mon Sep 17 00:00:00 2001 From: Tony Rewin Date: Fri, 6 Oct 2023 05:33:51 +0300 Subject: [PATCH] port=80 --- Dockerfile | 4 ++-- services/viewed.py | 28 ++++++++++++++-------------- settings.py | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 73fef91b..5a931e4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ FROM python:slim WORKDIR /app -EXPOSE 8080 +EXPOSE 80 # ADD nginx.conf.sigil ./ COPY requirements.txt . -RUN apt update && apt install -y build-essential git +RUN apt-get update && apt-get install -y build-essential git ENV GIT_SSH_COMMAND "ssh -v" RUN pip install -r requirements.txt COPY . . diff --git a/services/viewed.py b/services/viewed.py index ae4fbe61..634ef32f 100644 --- a/services/viewed.py +++ b/services/viewed.py @@ -75,17 +75,17 @@ class ViewedStorage: {"Authorization": "Bearer %s" % str(token)}, schema=schema_str ) print( - "[stat.viewed] * authorized permanentely by ackee.discours.io: %s" + "[stat] * authorized permanentely by ackee.discours.io: %s" % token ) else: - print("[stat.viewed] * please set ACKEE_TOKEN") + print("[stat] * please set ACKEE_TOKEN") self.disabled = True @staticmethod async def update_pages(): """query all the pages from ackee sorted by views count""" - print("[stat.viewed] ⎧ updating ackee pages data ---") + print("[stat] ⎧ updating ackee pages data ---") start = time.time() self = ViewedStorage try: @@ -101,12 +101,12 @@ class ViewedStorage: await ViewedStorage.increment(slug, shouts[slug]) except Exception: pass - print("[stat.viewed] ⎪ %d pages collected " % len(shouts.keys())) + print("[stat] ⎪ %d pages collected " % len(shouts.keys())) except Exception as e: raise e end = time.time() - print("[stat.viewed] ⎪ update_pages took %fs " % (end - start)) + print("[stat] ⎪ update_pages took %fs " % (end - start)) @staticmethod async def get_facts(): @@ -171,16 +171,16 @@ class ViewedStorage: if viewer == "old-discours": # this is needed for old db migration if shout.viewsOld == amount: - print(f"viewsOld amount: {amount}") + print(f"[stat] viewsOld amount: {amount}") else: - print(f"viewsOld amount changed: {shout.viewsOld} --> {amount}") + print(f"[stat] viewsOld amount changed: {shout.viewsOld} --> {amount}") shout.viewsOld = amount else: if shout.viewsAckee == amount: - print(f"viewsAckee amount: {amount}") + print(f"[stat] viewsAckee amount: {amount}") else: print( - f"viewsAckee amount changed: {shout.viewsAckee} --> {amount}" + f"[stat] viewsAckee amount changed: {shout.viewsAckee} --> {amount}" ) shout.viewsAckee = amount @@ -200,23 +200,23 @@ class ViewedStorage: while True: try: - print("[stat.viewed] - updating views...") + print("[stat] - updating views...") await self.update_pages() failed = 0 except Exception: failed += 1 - print("[stat.viewed] - update failed #%d, wait 10 seconds" % failed) + print("[stat] - update failed #%d, wait 10 seconds" % failed) if failed > 3: - print("[stat.viewed] - not trying to update anymore") + print("[stat] - not trying to update anymore") break if failed == 0: when = datetime.now(timezone.utc) + timedelta(seconds=self.period) t = format(when.astimezone().isoformat()) print( - "[stat.viewed] ⎩ next update: %s" + "[stat] ⎩ next update: %s" % (t.split("T")[0] + " " + t.split("T")[1].split(".")[0]) ) await asyncio.sleep(self.period) else: await asyncio.sleep(10) - print("[stat.viewed] - trying to update data again") + print("[stat] - trying to update data again") diff --git a/settings.py b/settings.py index 54897dfa..3c1b9155 100644 --- a/settings.py +++ b/settings.py @@ -1,6 +1,6 @@ from os import environ -PORT = 8080 +PORT = 80 DB_URL = ( environ.get("DATABASE_URL") or environ.get("DB_URL") or