aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2018-06-14 14:29:46 +0000
committerEric S. Raymond <esr@thyrsus.com>2018-06-14 14:29:46 +0000
commit0de9a1e59ea9da9eb800d924c4bb94f4561c131f (patch)
treede741b674e95a1d62a80299c6f9cbfe1123c94c1
parentMerge branch 'bugs/drop_event_handler_sorting' into 'master' (diff)
parentdo not hardcode syslog devices (diff)
downloadirker-0de9a1e59ea9da9eb800d924c4bb94f4561c131f.tar.xz
Merge branch 'syslog' into 'master'HEADmaster
do not hardcode syslog devices See merge request esr/irker!11
-rwxr-xr-xirkerd9
1 files changed, 1 insertions, 8 deletions
diff --git a/irkerd b/irkerd
index 9d5f890..d41a82c 100755
--- a/irkerd
+++ b/irkerd
@@ -1001,16 +1001,9 @@ if __name__ == '__main__':
args = parser.parse_args()
if not args.log_file and in_background():
- # The Linux, Mac, and FreeBSD values of the logging device.
- logdev = [x for x in ('/dev/log', '/var/run/syslog', '/var/run/log')
- if os.path.exists(x) and not os.path.isdir(x)]
- if len(logdev) != 1:
- sys.stderr.write("can't initialize log device, bailing out!\n")
- raise SystemExit(1)
# There's a case for falling back to address = ('localhost', 514)
# But some systems (including OS X) disable this for security reasons.
- handler = logging.handlers.SysLogHandler(address=logdev[0],
- facility='daemon')
+ handler = logging.handlers.SysLogHandler(facility='daemon')
else:
handler = logging.StreamHandler()