Просмотр исходного кода

extend logging

* make systemd.service log a timestamp that can be read by fail2ban
* add dependency on moreutils to manifest.toml (needed in systemd.service)
Chris Vogel 1 год назад
Родитель
Сommit
b271454e8d
2 измененных файлов с 3 добавлено и 2 удалено
  1. 1 1
      conf/systemd.service
  2. 2 1
      manifest.toml

+ 1 - 1
conf/systemd.service

@@ -8,7 +8,7 @@ User=__APP__
 Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/__APP__
 Environment="VENV_DIR=__INSTALL_DIR__/venv/"
-ExecStart=__INSTALL_DIR__/venv/bin/uvicorn --host 127.0.0.1 --port __PORT__ --reload flohmarkt.web:start
+ExecStart=/bin/bash -c "/opt/flohmarkt/venv/bin/uvicorn --host 127.0.0.1 --port 8000 --reload flohmarkt.web:start  2>&1 | /usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%S'"
 StandardOutput=append:/var/log/__APP__/__APP__.log
 StandardError=inherit
 

+ 2 - 1
manifest.toml

@@ -156,7 +156,8 @@ ram.runtime = "100M"
 
     [resources.apt]
     # python dependencies shall be installed in a venv using pip.
-    packages = "python3-pip python3-full curl apt-transport-https gnupg"
+	# moreutils is needed for `ts` used in systemd.service
+    packages = "python3-pip python3-full curl apt-transport-https gnupg moreutils"
     # repo for couchdb - doesn't work, yet
     # extras.couchdb.repo = "deb https://apache.jfrog.io/artifactory/couchdb-deb/ __YNH_DEBIAN_VERSION__ main"
     # extras.couchdb.key = "https://couchdb.apache.org/repo/keys.asc"