import optparse
import os
import platform
+import stat
import subprocess
import sys
import time
logging.basicConfig(format=FORMAT, level=lvl)
LOG = logging.getLogger(__name__)
logsock = '/dev/log'
-if os.path.exists('/var/run/log'): # Kfreebsd randomly different
+if os.path.exists('/var/run/log') and stat.S_ISSOCK(os.stat('/var/run/log').st_mode): # Kfreebsd randomly different
logsock = '/var/run/log'
syslog_handler = logging.handlers.SysLogHandler(address = logsock)
formatter = logging.Formatter(SFORMAT)
timestamp = message.get('timestamp', last_update)
message = message.get('message', 'update required')
LOG.debug("Got message at %s: %s" % (last_update, message))
- if last_run > timestamp, last_update):
+ if last_run > timestamp:
return
command = ['/usr/bin/ud-replicate']
else:
LOG.debug('%s finished with ret: 0' % ' '.join(command))
finally:
- os.environ['TERM'] = old_term
+ if old_term is not None:
+ os.environ['TERM'] = old_term
last_run = last_update
def main():