X-Git-Url: https://git.distorted.org.uk/~mdw/hippotat/blobdiff_plain/e6bec44d1f87f5094effda2643fc878900f25a02..d72f83602e9173940102c718974025e16b873657:/hippotatd diff --git a/hippotatd b/hippotatd index 123943a..666fc1b 100755 --- a/hippotatd +++ b/hippotatd @@ -296,7 +296,8 @@ def process_cfg(_opts, putative_servers, putative_clients): global c c = ConfigResults() - c.server = cfg.get('SERVER','server') + try: c.server = cfg.get('SERVER','server') + except NoOptionError: c.server = 'SERVER' cfg_process_common(c, c.server) cfg_process_saddrs(c, c.server) @@ -319,6 +320,9 @@ def process_cfg(_opts, putative_servers, putative_clients): c.vrelay = search break + try: c.ifname = cfg.get(c.server, 'ifname_server', raw=True) + except NoOptionError: pass + cfg_process_ipif(c, [c.server, 'DEFAULT'], (('local','vaddr'), @@ -408,8 +412,7 @@ def daemonise(): pidfile_h.close() logger = subprocess.Popen(['logger','-d', - '-t','hippotat(stderr)', - '--id=%d' % mypid, + '-t','hippotat[%d](stderr)' % os.getpid(), '-p',opts.syslogfacility + '.err'], stdin=subprocess.PIPE, stdout=subprocess.DEVNULL,