Limiting the sizes of logs

[theonering] / src / theonering.py

diff --git a/src/theonering.py b/src/theonering.py
index 7952ab0..f8a26f4 100755 (executable)
--- a/src/theonering.py
+++ b/src/theonering.py
@@ -23,6 +23,7 @@ import os
 import sys
 import signal
 import logging
+import logging.handlers
 import gobject
 
 import dbus.glib
@@ -34,9 +35,6 @@ import constants
 import connection_manager
 
 
-IDLE_TIMEOUT = 5000
-
-
 def run_theonering(persist):
        linux_utils.set_process_name(constants.__app_name__)
 
@@ -47,23 +45,26 @@ def run_theonering(persist):
                        raise
 
        @gobject_utils.async
-       def quit():
+       def on_quit():
                manager.quit()
                mainloop.quit()
 
        def timeout_cb():
                if len(manager._connections) == 0:
                        logging.info('No connection received - quitting')
-                       quit()
+                       on_quit()
                return False
 
        if persist:
                shutdown_callback = None
        else:
-               gobject.timeout_add(IDLE_TIMEOUT, timeout_cb)
-               shutdown_callback = quit
+               gobject_utils.timeout_add_seconds(
+                       connection_manager.TheOneRingConnectionManager.IDLE_TIMEOUT,
+                       timeout_cb
+               )
+               shutdown_callback = on_quit
 
-       signal.signal(signal.SIGTERM, quit)
+       signal.signal(signal.SIGTERM, lambda: on_quit)
 
        try:
                manager = connection_manager.TheOneRingConnectionManager(shutdown_func=shutdown_callback)
@@ -73,6 +74,8 @@ def run_theonering(persist):
 
        mainloop = gobject.MainLoop(is_running=True)
 
+       gobject.threads_init()
+       dbus.glib.init_threads()
        while mainloop.is_running():
                try:
                        mainloop.run()
@@ -88,26 +91,23 @@ def main(logToFile):
                        raise
 
        telepathy_utils.debug_divert_messages(os.getenv('THEONERING_LOGFILE'))
-       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,
-                       format='(%(asctime)s) %(levelname)s:%(name)s:%(message)s',
-                       datefmt='%H:%M:%S',
-               )
+       logFormat = '(%(asctime)s) %(levelname)-5s %(threadName)s.%(name)s: %(message)s'
+       logging.basicConfig(
+               level=logging.DEBUG,
+               format=logFormat,
+               datefmt='%H:%M:%S',
+       )
+       logging.raiseExceptions = True # Getting funky shutdown behavior, checking it out
+       rotating = logging.handlers.RotatingFileHandler(constants._user_logpath_, maxBytes=512*1024, backupCount=1)
+       rotating.setFormatter(logging.Formatter(logFormat))
+       root = logging.getLogger()
+       root.addHandler(rotating)
        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)