X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Ftheonering.py;h=1bc74364ebbdee4e8560aee46d473d148482e2cc;hp=58b00fe596c8ea293c2f6f6c0951b8d52becaf2a;hb=cf08f5245ddf0233f0b62fbde6d335885405d987;hpb=08b65073d2ea256b795917ccb18003011aa06ef0

diff --git a/src/theonering.py b/src/theonering.py
index 58b00fe..1bc7436 100755
--- a/src/theonering.py
+++ b/src/theonering.py
@@ -34,7 +34,7 @@ import constants
 import connection_manager
 
 
-IDLE_TIMEOUT = 5000
+IDLE_TIMEOUT = 5
 
 
 def run_theonering(persist):
@@ -60,7 +60,7 @@ def run_theonering(persist):
 	if persist:
 		shutdown_callback = None
 	else:
-		gobject.timeout_add(IDLE_TIMEOUT, timeout_cb)
+		gobject_utils.timeout_add_seconds(IDLE_TIMEOUT, timeout_cb)
 		shutdown_callback = quit
 
 	signal.signal(signal.SIGTERM, quit)
@@ -91,18 +91,22 @@ def main(logToFile):
 	if logToFile:
 		logging.basicConfig(
 			level=logging.DEBUG,
+			filename=constants._user_logpath_,
 			format='(%(asctime)s) %(levelname)s:%(name)s:%(message)s',
 			datefmt='%H:%M:%S',
 		)
 	else:
-		logging.basicConfig(level=logging.DEBUG, filename=constants._user_logpath_)
+		logging.basicConfig(
+			level=logging.INFO,
+			format='(%(asctime)s) %(levelname)s:%(name)s:%(message)s',
+			datefmt='%H:%M:%S',
+		)
 	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])
+	logging.debug("OS: %s" % (os.uname()[0], ))
+	logging.debug("Kernel: %s (%s) for %s" % os.uname()[2:])
+	logging.debug("Hostname: %s" % os.uname()[1])
 
 	persist = 'THEONERING_PERSIST' in os.environ
-	persist = True
 
 	try:
 		run_theonering(persist)