1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
Description: add syslog messages on errors
Author: Jörg Frings-Fürst <debian@jffwebhosting.net>
Forwarded: via mail
Last-Update: 2014-05-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/mwc.py
===================================================================
--- trunk.orig/mwc.py
+++ trunk/mwc.py
@@ -21,6 +21,7 @@ import os
import sys
import getopt
import traceback
+import syslog
import subprocess
@@ -248,11 +249,13 @@ def sendmail(receiver, subject, content,
#
except:
print('Error: Open smtp-session')
+ syslog.syslog(syslog.LOG_ERR, 'can not open smtp session')
exit(4)
try:
mailsession.sendmail(config.sender, receiver.split(','), mail.as_string())
except:
print('Error: sendmail')
+ syslog.syslog(syslog.LOG_ERR, 'error on sendmail')
exit(5)
# returns a list of all content that is stored locally for a specific site
@@ -349,6 +352,11 @@ if __name__ == "__main__":
configMod = '/etc/mwc/mwc-config'
dryrun = None
+ #
+ # add syslog open
+ #
+ syslog.openlog()
+
try:
opts, args = getopt.getopt(sys.argv[1:], 'hc:d:', ['help', 'config=', 'dry-run='])
except getopt.GetoptError:
@@ -374,11 +382,13 @@ if __name__ == "__main__":
config = importlib.import_module(fullname)
except:
print('Error: loading config')
+ syslog.syslog(syslog.LOG_ERR, 'can not found / load mwc-config')
sys.exit(2)
try:
os.chdir(config.datadir)
except:
print('Error: datadir not found')
+ syslog.syslog(syslog.LOG_ERR, 'datadir not found')
sys.exit(3)
if dryrun:
@@ -400,3 +410,5 @@ if __name__ == "__main__":
if mailsession:
mailsession.quit()
mailsession = None
+
+ syslog.closelog()
|
