X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Ftelepathy-theonering;h=6d08aaae2ed639ee02d21d89148d265484c2eed5;hp=33decda1d9bf359ce3fe1e0f29ec464dcdae4b53;hb=8b77cf6f2a6b8f1ec930395d8f9b762fa1d4bfbc;hpb=c1299d00ddbb17aa0bf8826f9f6e98d0a756c16f diff --git a/src/telepathy-theonering b/src/telepathy-theonering index 33decda..6d08aaa 100755 --- a/src/telepathy-theonering +++ b/src/telepathy-theonering @@ -37,9 +37,15 @@ import connection_manager IDLE_TIMEOUT = 5000 -def run_theonering(): +def run_theonering(persist): linux_utils.set_process_name(constants.__app_name__) + try: + os.makedirs(constants._data_path_) + except OSError, e: + if e.errno != 17: + raise + @gobject_utils.async def quit(): manager.quit() @@ -51,11 +57,11 @@ def run_theonering(): quit() return False - if 'THEONERING_PERSIST' not in os.environ: + if persist: + shutdown_callback = None + else: gobject.timeout_add(IDLE_TIMEOUT, timeout_cb) shutdown_callback = quit - else: - shutdown_callback = None signal.signal(signal.SIGTERM, quit) @@ -77,4 +83,11 @@ def run_theonering(): if __name__ == '__main__': telepathy_utils.debug_divert_messages(os.getenv('THEONERING_LOGFILE')) logging.basicConfig(level=logging.DEBUG) - run_theonering() + logging.info("telepathy-theonering %s-%s" % (constants.__version__, constants.__build__)) + logging.info("OS: %s" % (os.uname()[0], )) + logging.info("Kernel: %s (%s) for %s" % os.uname()[2:]) + logging.info("Hostname: %s" % os.uname()[1]) + + persist = 'THEONERING_PERSIST' in os.environ + persist = True + run_theonering(persist)