Add WEBHOOK_URL to .env.example

.env.example

@@ -11,3 +11,6 @@ CONNECTION_URI="mongodb+srv://mongodburi"
 CLIENT_ID = "YOUR APP'S CLIENT ID HERE"
 CLIENT_SECRET = "YOUR APP'S CLIENT SECRET HERE"
 REDIRECT_URI = "https://yourdomain.com/callback"
+
+# OLLI
+WEBHOOK_URL = "YOUR WEBHOOK URL HERE"

Dockerfile

@@ -9,6 +9,9 @@ RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-
 # Copy using poetry.lock* in case it doesn't exist yet
 COPY ./pyproject.toml ./poetry.lock* /app/
 
+# Copy olli config to a known place
+COPY ./olli.toml /config/
+
 RUN poetry install --no-root --no-dev
 
 COPY . /app

docker-compose.yml

@@ -53,6 +53,11 @@ services:
       - staticfiles:/var/www/static
     environment:
       - APP_MODULE=website.main:app
+    logging:
+      driver: loki
+      options:
+        loki-url: http://localhost:3100/loki/api/v1/push
+        loki-external-labels: job=site
 
   bot:
     << : *restart_policy
@@ -65,6 +70,11 @@ services:
     tty: true
     depends_on:
       - web
+    logging:
+      driver: loki
+      options:
+        loki-url: http://localhost:3100/loki/api/v1/push
+        loki-external-labels: job=bot
 
 volumes:
   staticfiles:

modmail/bot.py

@@ -76,4 +76,3 @@ def ensure_exception(fut: asyncio.Future) -> None:
     async def on_ready(self) -> None:
         """Send basic login success message."""
         log.info("Logged in as %s", self.user)
-        log.error("test")

olli.toml

@@ -0,0 +1,23 @@
+[olli]
+interval_minutes = 5
+
+[loki]
+api_url = "http://loki:3100/"
+jobs = [
+    "bot", "site"
+]
+
+[discord]
+WEBHOOK_URL = "https://discord.com/api/webhooks/849632109304086579/-e5kUMlLW9aLhuxUbTIimy3bqClD4Uy3662WlEkjyZ1It7cgwU30x_7YWDxc-nJhpn1W"
+
+[[olli.tokens]]
+token = "ERROR"
+color = "#ff5f5f"
+
+[[olli.tokens]]
+token = "WARN"
+color = "#ffe24d"
+case_sensitive = true
+
+[[olli.tokens]]
+token = "INFO"