switch to explicit journald logger instead of syslog

also remove makedependencies after installation in docker

.github/workflows/setup.sh

@@ -10,7 +10,7 @@ echo -e '[arcanisrepo]\nServer = http://repo.arcanis.me/$arch\nSigLevel = Never'
 # refresh the image
 pacman --noconfirm -Syu
 # main dependencies
-pacman --noconfirm -Sy base-devel devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-srcinfo sudo
+pacman --noconfirm -Sy base-devel devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-srcinfo python-systemd sudo
 # make dependencies
 pacman --noconfirm -Sy python-build python-installer python-wheel
 # optional dependencies

.readthedocs.yaml

@@ -6,7 +6,7 @@ formats:
 build:
   os: ubuntu-20.04
   tools:
-    python: "3.10"
+    python: "3.11"
 
 sphinx:
   builder: html

Dockerfile

@@ -6,7 +6,7 @@ ENV AHRIMAN_DEBUG=""
 ENV AHRIMAN_FORCE_ROOT=""
 ENV AHRIMAN_HOST="0.0.0.0"
 ENV AHRIMAN_MULTILIB="yes"
-ENV AHRIMAN_OUTPUT="syslog"
+ENV AHRIMAN_OUTPUT="journald"
 ENV AHRIMAN_PACKAGER="ahriman bot <ahriman@example.com>"
 ENV AHRIMAN_PACMAN_MIRROR=""
 ENV AHRIMAN_PORT=""
@@ -28,15 +28,12 @@ RUN useradd -m -d "/home/build" -s "/usr/bin/nologin" build && \
 COPY "docker/install-aur-package.sh" "/usr/local/bin/install-aur-package"
 ## install package dependencies
 ## darcs is not installed by reasons, because it requires a lot haskell packages which dramatically increase image size
-RUN pacman --noconfirm -Sy devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-srcinfo && \
-    pacman --noconfirm -Sy python-build python-installer python-wheel && \
-    pacman --noconfirm -Sy breezy mercurial python-aiohttp python-aiohttp-cors python-boto3 python-cryptography python-jinja python-requests-unixsocket rsync subversion && \
+RUN pacman -Sy --noconfirm --asdeps devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-srcinfo python-systemd && \
+    pacman -Sy --noconfirm --asdeps python-build python-installer python-wheel && \
+    pacman -Sy --noconfirm breezy mercurial python-aiohttp python-aiohttp-cors python-boto3 python-cryptography python-jinja python-requests-unixsocket rsync subversion && \
     runuser -u build -- install-aur-package python-aioauth-client python-aiohttp-apispec-git python-aiohttp-jinja2  \
                                             python-aiohttp-debugtoolbar python-aiohttp-session python-aiohttp-security
 
-# cleanup unused
-RUN find "/var/cache/pacman/pkg" -type f -delete
-
 # install ahriman
 ## copy tree
 COPY --chown=build . "/home/build/ahriman"
@@ -48,6 +45,10 @@ RUN cd "/home/build/ahriman" && \
     runuser -u build -- makepkg --noconfirm --install --skipchecksums && \
     cd / && rm -r "/home/build/ahriman"
 
+# cleanup unused
+RUN find "/var/cache/pacman/pkg" -type f -delete
+RUN pacman -Qdtq | pacman -Rscn --noconfirm -
+
 VOLUME ["/var/lib/ahriman"]
 
 # minimal runtime ahriman setup

docker/entrypoint.sh

@@ -15,7 +15,7 @@ database = $AHRIMAN_REPOSITORY_ROOT/ahriman.db
 host = $AHRIMAN_HOST
 
 EOF
-sed -i "s|handlers = syslog_handler|handlers = ${AHRIMAN_OUTPUT}_handler|g" "/etc/ahriman.ini.d/logging.ini"
+sed -i "s|handlers = journald_handler|handlers = ${AHRIMAN_OUTPUT}_handler|g" "/etc/ahriman.ini.d/logging.ini"
 
 AHRIMAN_DEFAULT_ARGS=("--architecture" "$AHRIMAN_ARCHITECTURE")
 if [[ "$AHRIMAN_OUTPUT" == "syslog" ]]; then

docs/faq.rst

@@ -1,4 +1,3 @@
-
 FAQ
 ===
 
@@ -765,7 +764,7 @@ How to setup web service
 
    .. code-block:: shell
 
-      yay -S python-aiohttp python-aiohttp-jinja2
+      yay -S python-aiohttp python-aiohttp-jinja2 python-aiohttp-apispec>=3.0.0 python-aiohttp-cors
 
 #. 
    Configure service:
@@ -975,13 +974,17 @@ It is automation tools for ``repoctl`` mentioned above. Except for using shell i
 How to check service logs
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-By default, the service writes logs to ``/dev/log`` which can be accessed by using ``journalctl`` command (logs are written to the journal of the user under which command is run).
+By default, the service writes logs to ``/dev/log`` which can be accessed by using ``journalctl`` command (logs are written to the journal of the user under which command is run). In order to retrieve logs for the process you can use the following command:
+
+.. code-block:: shell
+
+   sudo journalctl SYSLOG_IDENTIFIER=ahriman
 
 You can also edit configuration and forward logs to ``stderr``, just change ``handlers`` value, e.g.:
 
 .. code-block:: shell
 
-   sed -i 's/handlers = syslog_handler/handlers = console_handler/g' /etc/ahriman.ini.d/logging.ini
+   sed -i 's/handlers = journald_handler/handlers = console_handler/g' /etc/ahriman.ini.d/logging.ini
 
 You can even configure logging as you wish, but kindly refer to python ``logging`` module `configuration <https://docs.python.org/3/library/logging.config.html>`_. The application uses java concept to log messages, e.g. class ``Application`` imported from ``ahriman.application.application`` package will have logger called ``ahriman.application.application.Application``. In order to e.g. change logger name for whole application package it is possible to change values for ``ahriman.application`` package; thus editing ``ahriman`` logger configuration will change logging for whole application (unless there are overrides for another logger).
 

docs/triggers.rst

@@ -73,7 +73,7 @@ The ``context`` also implements collection methods such as ``__iter__`` and ``__
 Trigger example
 ---------------
 
-Lets consider example of reporting trigger (e.g. `slack <https://slack.com/>`_, which provides easy HTTP API for integration triggers).gre
+Lets consider example of reporting trigger (e.g. `slack <https://slack.com/>`_, which provides easy HTTP API for integration triggers).
 
 In order to post message to slack we will need a specific trigger url (something like ``https://hooks.slack.com/services/company_id/trigger_id``), channel (e.g. ``#archrepo``) and username (``repo-bot``).
 

package/archlinux/PKGBUILD

@@ -7,7 +7,8 @@ pkgdesc="ArcH linux ReposItory MANager"
 arch=('any')
 url="https://github.com/arcan1s/ahriman"
 license=('GPL3')
-depends=('devtools' 'git' 'pyalpm' 'python-cerberus' 'python-inflection' 'python-passlib' 'python-requests' 'python-srcinfo')
+depends=('devtools>=1:1.0.0' 'git' 'pyalpm' 'python-cerberus' 'python-inflection' 'python-passlib' 'python-requests'
+         'python-srcinfo' 'python-systemd')
 makedepends=('python-build' 'python-installer' 'python-wheel')
 optdepends=('breezy: -bzr packages support'
             'darcs: -darcs packages support'
@@ -29,6 +30,7 @@ optdepends=('breezy: -bzr packages support'
 source=("https://github.com/arcan1s/ahriman/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz"
         'ahriman.sysusers'
         'ahriman.tmpfiles')
+install="$pkgname.install"
 backup=('etc/ahriman.ini'
         'etc/ahriman.ini.d/logging.ini')
 
@@ -52,6 +54,6 @@ package() {
   install -Dm644 "$srcdir/$pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
 }
 
-sha512sums=('112b0d8aac68e5330bbdd2b86a59c8a9af8ab7a7c636489623c8460bb90f1318585851edd2a97a8ce20e2d2ad93b847b522685df707c190aa39d23ab908fa8ef'
+sha512sums=('19841842641520b573cdde6cb80a7cfcd69756d323fdfeebc2eee2d264a1325ead4ab2f8383bb369f7896bfc1de59d7358f133f4afeb90a9b9f0695f482a58d0'
             '53d37efec812afebf86281716259f9ea78a307b83897166c72777251c3eebcb587ecee375d907514781fb2a5c808cbb24ef9f3f244f12740155d0603bf213131'
             '62b2eccc352d33853ef243c9cddd63663014aa97b87242f1b5bc5099a7dbd69ff3821f24ffc58e1b7f2387bd4e9e9712cc4c67f661b1724ad99cdf09b3717794')

package/archlinux/ahriman.install

@@ -0,0 +1,25 @@
+post_upgrade() {
+    local breakpoints=(
+        2.9.0-1
+    )
+
+    for v in "${breakpoints[@]}"; do
+        if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
+            "_${v//[.-]/_}_changes"
+        fi
+    done
+}
+
+_2_9_0_1_changes() {
+    cat << EOF
+It was found that you were upgrading from old-devtools package to the new one, which requires manual intervention:
+
+* make sure that devtools are upgraded to the latest release;
+* merge service configuration if required;
+* run setup command (i.e. sudo ahriman service-setup) with the same arguments as you did before;
+* remove build chroot: sudo rm -r /var/lib/ahriman/chroot/ahriman-x86_64/;
+* update local databases: sudo -u ahriman ahriman update --no-aur --no-local --no-manual -yy;
+
+For more information kindly refer to changelog https://github.com/arcan1s/ahriman/releases/tag/2.9.0
+EOF
+}

package/archlinux/ahriman.sysusers

@@ -1 +1 @@
-u ahriman 643 "ArcH linux ReposItory MANager" /var/lib/ahriman
+u ahriman 643 "ArcH linux ReposItory MANager" /var/lib/ahriman

package/share/ahriman/settings/ahriman.ini.d/logging.ini

@@ -2,7 +2,7 @@
 keys = root,http,stderr,boto3,botocore,nose,s3transfer
 
 [handlers]
-keys = console_handler,syslog_handler
+keys = console_handler,journald_handler,syslog_handler
 
 [formatters]
 keys = generic_format,syslog_format
@@ -13,6 +13,12 @@ level = DEBUG
 formatter = generic_format
 args = (sys.stderr,)
 
+[handler_journald_handler]
+class = systemd.journal.JournalHandler
+level = DEBUG
+formatter = syslog_format
+kwargs = {"SYSLOG_IDENTIFIER": "ahriman"}
+
 [handler_syslog_handler]
 class = logging.handlers.SysLogHandler
 level = DEBUG
@@ -29,12 +35,12 @@ datefmt =
 
 [logger_root]
 level = DEBUG
-handlers = syslog_handler
+handlers = journald_handler
 qualname = root
 
 [logger_http]
 level = DEBUG
-handlers = syslog_handler
+handlers = journald_handler
 qualname = http
 propagate = 0
 
@@ -45,24 +51,24 @@ qualname = stderr
 
 [logger_boto3]
 level = INFO
-handlers = syslog_handler
+handlers = journald_handler
 qualname = boto3
 propagate = 0
 
 [logger_botocore]
 level = INFO
-handlers = syslog_handler
+handlers = journald_handler
 qualname = botocore
 propagate = 0
 
 [logger_nose]
 level = INFO
-handlers = syslog_handler
+handlers = journald_handler
 qualname = nose
 propagate = 0
 
 [logger_s3transfer]
 level = INFO
-handlers = syslog_handler
+handlers = journald_handler
 qualname = s3transfer
 propagate = 0