mirror of
https://kernel.googlesource.com/pub/scm/linux/kernel/git/tglx/remail.git
synced 2024-11-08 13:42:36 +01:00
remail/pipe: Add command line option to handle config updates
When using pipe mode configuration updates are not handled until the next mail is sent to the list. That means that e.g. welcome mails are delayed. Add a command line option to allow the invocation of remail_pipe just to deal with configuration updates without trying to process mail from stdin. The update handling is serialized against concurrent incoming mail via the folder lock, so no extra serialization is required. Whichever comes first handles it. Reported-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Tested-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
This commit is contained in:
parent
3237b7ee67
commit
05ac7bb6ac
3 changed files with 17 additions and 3 deletions
|
@ -24,6 +24,14 @@ Options
|
||||||
-h, --help
|
-h, --help
|
||||||
Show this help message and exit
|
Show this help message and exit
|
||||||
|
|
||||||
|
-c, --cfgupdate
|
||||||
|
Read the configuration update and do not process mail from stdin. That
|
||||||
|
allows to send out welcome mails after a list configuration file was
|
||||||
|
updated. Otherwise the welcome mails are delayed until actual mail
|
||||||
|
delivery happens. The update and welcome mail processing is serialized
|
||||||
|
via the lock file in the working directory; no external serialization
|
||||||
|
against a concurrent mail delivery required.
|
||||||
|
|
||||||
-s syslog, --syslog
|
-s syslog, --syslog
|
||||||
Use syslog for logging. Default is stderr
|
Use syslog for logging. Default is stderr
|
||||||
|
|
||||||
|
@ -59,7 +67,7 @@ Exit codes
|
||||||
.. list-table::
|
.. list-table::
|
||||||
|
|
||||||
* - 0
|
* - 0
|
||||||
- Mail was successfully delivered
|
- Mail was successfully delivered or config update was successful
|
||||||
* - 1
|
* - 1
|
||||||
- No enabled mailinglist found for delivery
|
- No enabled mailinglist found for delivery
|
||||||
* - 2
|
* - 2
|
||||||
|
|
|
@ -370,13 +370,16 @@ class remaild(object):
|
||||||
return self.should_stop()
|
return self.should_stop()
|
||||||
|
|
||||||
# The pipe handling interface
|
# The pipe handling interface
|
||||||
def handle_pipe(self):
|
def handle_pipe(self, cfgupdate):
|
||||||
self._should_reload = True
|
self._should_reload = True
|
||||||
self.reconfigure()
|
self.reconfigure()
|
||||||
|
|
||||||
if not self.enabled:
|
if not self.enabled:
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
if cfgupdate:
|
||||||
|
return 0
|
||||||
|
|
||||||
policy = EmailPolicy(utf8=True)
|
policy = EmailPolicy(utf8=True)
|
||||||
msg = message_from_file(sys.stdin, policy=policy)
|
msg = message_from_file(sys.stdin, policy=policy)
|
||||||
return self.process_msg(msg, 'pipe input')
|
return self.process_msg(msg, 'pipe input')
|
||||||
|
|
|
@ -19,6 +19,9 @@ def exit_daemon(logger, res):
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
parser = ArgumentParser(description='remail pipe')
|
parser = ArgumentParser(description='remail pipe')
|
||||||
parser.add_argument('config', help='Config file')
|
parser.add_argument('config', help='Config file')
|
||||||
|
parser.add_argument('--cfgupdate', '-c', dest='cfgupdate',
|
||||||
|
action='store_true',
|
||||||
|
help='Handle config file update. No mail processing.')
|
||||||
parser.add_argument('--syslog', '-s', dest='syslog', action='store_true',
|
parser.add_argument('--syslog', '-s', dest='syslog', action='store_true',
|
||||||
help='Use syslog for logging. Default is stderr')
|
help='Use syslog for logging. Default is stderr')
|
||||||
parser.add_argument('--verbose', '-v', dest='verbose', action='store_true',
|
parser.add_argument('--verbose', '-v', dest='verbose', action='store_true',
|
||||||
|
@ -46,7 +49,7 @@ if __name__ == '__main__':
|
||||||
exit_daemon(logger, 11)
|
exit_daemon(logger, 11)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
res = rd.handle_pipe()
|
res = rd.handle_pipe(args.cfgupdate)
|
||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
'''
|
'''
|
||||||
Exceptions which reach here are fatal
|
Exceptions which reach here are fatal
|
||||||
|
|
Loading…
Reference in a new issue