test log volume

.github/workflows/main.yml

@@ -121,6 +121,9 @@ jobs:
         credentials:
           username: ${{ secrets.USERNAME }}
           password: ${{ secrets.TOKEN }}
+        volumes:
+          - ./logs:/var/log/teapot'
+
     steps:
       - uses: actions/checkout@v4
         with:

.trunk/.gitignore

@@ -0,0 +1,9 @@
+*out
+*logs
+*actions
+*notifications
+*tools
+plugins
+user_trunk.yaml
+user.yaml
+tmp

.trunk/configs/.hadolint.yaml

@@ -0,0 +1,4 @@
+# Following source doesn't work in most setups
+ignored:
+  - SC1090
+  - SC1091

.trunk/configs/.isort.cfg

@@ -0,0 +1,2 @@
+[settings]
+profile=black

.trunk/configs/.markdownlint.yaml

@@ -0,0 +1,2 @@
+# Prettier friendly markdownlint config (all formatting rules disabled)
+extends: markdownlint/style/prettier

.trunk/configs/.shellcheckrc

@@ -0,0 +1,7 @@
+enable=all
+source-path=SCRIPTDIR
+disable=SC2154
+
+# If you're having issues with shellcheck following source, disable the errors via:
+# disable=SC1090
+# disable=SC1091

.trunk/configs/.yamllint.yaml

@@ -0,0 +1,7 @@
+rules:
+  quoted-strings:
+    required: only-when-needed
+    extra-allowed: ["{|}"]
+  key-duplicates: {}
+  octal-values:
+    forbid-implicit-octal: true

.trunk/configs/ruff.toml

@@ -0,0 +1,5 @@
+# Generic, formatter-friendly config.
+select = ["B", "D3", "E", "F"]
+
+# Never enforce `E501` (line length violations). This should be handled by formatters.
+ignore = ["E501"]

.trunk/trunk.yaml

@@ -0,0 +1,44 @@
+# This file controls the behavior of Trunk: https://docs.trunk.io/cli
+# To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
+version: 0.1
+cli:
+  version: 1.22.8
+# Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins)
+plugins:
+  sources:
+    - id: trunk
+      ref: v1.6.6
+      uri: https://github.com/trunk-io/plugins
+# Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes)
+runtimes:
+  enabled:
+    - [email protected]
+    - [email protected]
+    - [email protected]
+# This is the section where you manage your linters. (https://docs.trunk.io/check/configuration)
+lint:
+  enabled:
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - git-diff-check
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+actions:
+  disabled:
+    - trunk-announce
+    - trunk-check-pre-push
+    - trunk-fmt-pre-commit
+  enabled:
+    - trunk-upgrade-available

config.ini

@@ -1,14 +1,14 @@
 [Teapot]
 # Here is the configuration for the Teapot server
-APP_NAME=teapot
+APP_NAME = teapot
 # One less than the first port that is going to be used by any storm webdav
-STARTING_PORT=32399
+STARTING_PORT = 32399
 # instance timeout, Storm-webdav instances are automatically deleted after a period of inactivity specified here
 # default: 10 minutes
-INSTANCE_TIMEOUT_SEC=600
+INSTANCE_TIMEOUT_SEC = 600
 # interval between instance timeout checks in stop_expired_instances
 # default: 3 minutes
-CHECK_INTERVAL_SEC=180
+CHECK_INTERVAL_SEC = 180
 # Hostname for the Teapot's uvicorn server (without the https:// part)
 hostname = teapot
 # Port number Teapot is listening on
@@ -23,6 +23,8 @@ Teapot_ssl_certificate = /var/lib/teapot/webdav/teapot.crt
 Teapot_ssl_key = /var/lib/teapot/webdav/teapot.key
 # Path to the Teapot log file location
 log_location = /var/log/teapot/teapot.log
+# Teapot's log level
+log_level = INFO
 
 [Storm-webdav]
 # Here is the configuration for the Storm-Webdav server for each user

teapot.py

@@ -90,9 +90,9 @@ async def lifespan(app: FastAPI):
 flaat.set_trusted_OP_list(config["Teapot"]["trusted_OP"].split(", "))
 
 # logging is important
-LOGFILE = os.environ.get("TEAPOT_LOGFILE", config["Teapot"]["log_location"])
-LOGLEVEL = os.environ.get("TEAPOT_LOGLEVEL", "INFO").upper()
-logging.basicConfig(filename=LOGFILE, level=logging.getLevelName(LOGLEVEL))
+LOGFILE = config["Teapot"]["log_location"]
+LOGLEVEL = config["Teapot"]["log_level"]
+logging.basicConfig(format='%(asctime)s %(message)s', filename=LOGFILE, level=logging.getLevelName(LOGLEVEL))
 logger = logging.getLogger(__name__)
 
 SESSION_STORE_PATH = os.environ.get(