tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd: remove unused watchdog functionality

Browse Source 
Add restart on failure and increase timeout to kill service.

Signed-off-by: benutzer193 <registerbn@gmail.com>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
benutzer193 2017-06-01 15:29:12 +02:00 committed by Nicolas Sebrecht
parent f3b9963a48
commit efd2548f67
5 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
contrib/systemd/README.md
View File

@ -3,8 +3,8 @@ layout: page
title: Integrating OfflineIMAP into systemd title: Integrating OfflineIMAP into systemd
author: Ben Boeckel author: Ben Boeckel
date: 2015-03-22 date: 2015-03-22
contributors: Abdo Roig-Maranges contributors: Abdo Roig-Maranges, benutzer193
updated: 2015-03-25 updated: 2017-06-01
--- ---
<!-- This file is copied to the website by script. --> <!-- This file is copied to the website by script. -->
@ -25,25 +25,4 @@ These unit files are installed as being enabled via a `mail.target` unit which
is intended to be a catch-all for mail-related unit files. A simple is intended to be a catch-all for mail-related unit files. A simple
`mail.target` file is also provided. `mail.target` file is also provided.
## Signals
Systemd supports a watchdog (via the WatchdogSec service file option) which
will send the program a SIGABRT when the timer expires.
Offlineimap handles it in the same manner as SIGUSR2, so that the current
synchronisation is completed before the program exits safely.
This makes offlineimap more flexible and robust for persistent setups that make
use of holdconnectionopen and autorefresh options.
For example, it may be useful in assisting with the occasional situation where
offlineimap may not return successfully after a suspend and resume.
To make use of this, users could add the following to the [Service] section of
their corresponding systemd offlineimap-oneshot service file (restart every 5 minutes):
``` conf
Restart=on-watchdog
WatchdogSec=300
```

8
contrib/systemd/offlineimap-oneshot.service
View File

@ -5,10 +5,10 @@ Documentation=man:offlineimap(1)
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=/usr/bin/offlineimap -o -u syslog ExecStart=/usr/bin/offlineimap -o -u syslog
# Give 12 seconds for offlineimap to gracefully stop before hard killing it. # Give 120 seconds for offlineimap to gracefully stop before hard killing it.
TimeoutStopSec=12 TimeoutStopSec=120
#Restart=on-watchdog Restart=on-failure
#WatchdogSec=300 RestartSec=60
[Install] [Install]
WantedBy=mail.target WantedBy=mail.target

7
contrib/systemd/offlineimap-oneshot@.service
View File

@ -5,8 +5,11 @@ Documentation=man:offlineimap(1)
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=/usr/bin/offlineimap -o -a %i -u syslog ExecStart=/usr/bin/offlineimap -o -a %i -u syslog
#Restart=on-watchdog # Give 120 seconds for offlineimap to gracefully stop before hard killing it.
#WatchdogSec=300 TimeoutStopSec=120
Restart=on-failure
RestartSec=60
[Install] [Install]
WantedBy=mail.target WantedBy=mail.target

2
contrib/systemd/offlineimap.service
View File

@ -4,6 +4,8 @@ Documentation=man:offlineimap(1)
[Service] [Service]
ExecStart=/usr/bin/offlineimap -u syslog ExecStart=/usr/bin/offlineimap -u syslog
Restart=on-failure
RestartSec=60
[Install] [Install]
WantedBy=mail.target WantedBy=mail.target

2
contrib/systemd/offlineimap@.service
View File

@ -4,6 +4,8 @@ Documentation=man:offlineimap(1)
[Service] [Service]
ExecStart=/usr/bin/offlineimap -a %i -u syslog ExecStart=/usr/bin/offlineimap -a %i -u syslog
Restart=on-failure
RestartSec=60
[Install] [Install]
WantedBy=mail.target WantedBy=mail.target