projects
/
smailq.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4fbe052
)
smailq: Add syslog support
author
Matei David <matei@cs.toronto.edu>
Fri, 8 May 2015 16:39:52 +0000
(12:39 -0400)
committer
Stefan Huber <shuber@sthu.org>
Tue, 12 May 2015 18:34:01 +0000
(20:34 +0200)
smailq
patch
|
blob
|
history
diff --git
a/smailq
b/smailq
index d719d43a283e916d2a15299ba3a5218242eee328..73c954fcbb8bc757d3dae7b02ac9c4bd33ac8bbf 100755
(executable)
--- a/
smailq
+++ b/
smailq
@@
-20,6
+20,7
@@
import subprocess
import sys
import time
import socket
import sys
import time
import socket
+import syslog
verbose = False
verbose = False
@@
-302,13
+303,19
@@
class MailQueue:
def log(conf, msg, id=None):
"""Write message to log file"""
def log(conf, msg, id=None):
"""Write message to log file"""
+ # Prepend ID to msg
+ if id is not None:
+ msg = ("ID %s: " % id) + msg
+
+ if conf.getlogdir() == 'syslog':
+ syslog.syslog(msg)
+ return
+
fn = conf.getlogdir() + "/smailq.log"
with open(fn, 'a') as f:
fcntl.lockf(f, fcntl.LOCK_EX)
fn = conf.getlogdir() + "/smailq.log"
with open(fn, 'a') as f:
fcntl.lockf(f, fcntl.LOCK_EX)
- # Prepend ID to msg
- if id is not None:
- msg = ("ID %s: " % id) + msg
+
# Prepend time to msg
msg = time.strftime("%Y-%m-%d %H:%M:%S: ", time.localtime()) + msg
# Prepend time to msg
msg = time.strftime("%Y-%m-%d %H:%M:%S: ", time.localtime()) + msg
@@
-444,9
+451,11
@@
if __name__ == "__main__":
printerr("Data directory does not exist: " + conf.getdatadir())
sys.exit(os.EX_IOERR)
printerr("Data directory does not exist: " + conf.getdatadir())
sys.exit(os.EX_IOERR)
- if not os.path.isdir(conf.getlogdir()):
- printerr("Log directory does not exist: " + conf.getlogdir())
- sys.exit(os.EX_IOERR)
+ if conf.getlogdir() == 'syslog':
+ syslog.openlog('smailq', 0, syslog.LOG_MAIL)
+ elif not os.path.isdir(conf.getlogdir()):
+ printinfo('Creating logdir: ' + conf.getlogdir())
+ os.mkdir(conf.getlogdir())
except Exception as e:
printerr("Error reading config file:", e)
except Exception as e:
printerr("Error reading config file:", e)