[POS-commit] r3937 - in stoq/trunk/stoq: . lib

[Johan Dahlin]

Author: jdahlin
Date: Mon Jul 17 16:39:05 2006
New Revision: 3937

Modified:
   stoq/trunk/stoq/gui/application.py
   stoq/trunk/stoq/lib/stoqconfig.py
   stoq/trunk/stoq/main.py

Log:
Add some logging

Modified: stoq/trunk/stoq/gui/application.py
==============================================================================
--- stoq/trunk/stoq/gui/application.py	(original)
+++ stoq/trunk/stoq/gui/application.py	Mon Jul 17 16:39:05 2006
@@ -50,9 +50,6 @@
         self.window_class = window_class
         BaseApp.__init__(self, window_class)
 
-    def shutdown(self, *args):
-        BaseApp.shutdown(self, *args)
-
     def revalidate_user(self, *args):
         self.shutdown()
         self.config.clear_cookie()

Modified: stoq/trunk/stoq/lib/stoqconfig.py
==============================================================================
--- stoq/trunk/stoq/lib/stoqconfig.py	(original)
+++ stoq/trunk/stoq/lib/stoqconfig.py	Mon Jul 17 16:39:05 2006
@@ -31,19 +31,20 @@
 import time
 
 import gtk
+from kiwi.log import Logger
+from kiwi.ui.dialogs import warning
 from stoqlib.exceptions import (DatabaseError, UserProfileError,
                                 LoginError, DatabaseInconsistency)
 from stoqlib.gui.base.gtkadds import register_iconsets
 from stoqlib.lib.runtime import set_current_user, get_connection
 from stoqlib.domain.person import PersonAdaptToUser
 from stoqlib.domain.tables import get_table_types
-from kiwi.ui.dialogs import warning
 
 from stoq.gui.login import StoqLoginDialog
 from stoq.lib.configparser import get_config
 
 _ = gettext.gettext
-
+log = Logger('stoq.config')
 
 class AppConfig:
     """AppConfig provides features for:
@@ -57,12 +58,6 @@
     RETRY_NUMBER = 3
     config = get_config()
 
-    def init_log(self):
-        sys.stderr.write("-"*76 + "\n")
-
-    def log(self, s):
-        sys.stderr.write("%s: %s\n" % (log_header(), s))
-
     #
     # Application list accessors
     #
@@ -234,13 +229,10 @@
                     dialog.destroy()
                 self.abort_mission(str(e))
             else:
-                self.init_log()
-                # Log startup time
-                self.log("Stoq: initializing application %s" % self.appname)
                 if has_cookie_file:
-                    self.log("Logging in using cookie credentials")
+                    log.info("Logging in using cookie credentials")
                 else:
-                    self.log("Authenticated user %s" % username)
+                    log.info("Authenticated user %s" % username)
                 if dialog:
                     dialog.destroy()
                 return True

Modified: stoq/trunk/stoq/main.py
==============================================================================
--- stoq/trunk/stoq/main.py	(original)
+++ stoq/trunk/stoq/main.py	Mon Jul 17 16:39:05 2006
@@ -33,12 +33,14 @@
 from stoqlib.lib.message import error
 from stoqlib.lib.message import ISystemNotifier
 from kiwi.component import provide_utility
+from kiwi.log import Logger
 
 from stoq.lib.applist import get_application_names
 from stoq.lib.configparser import StoqConfig
 from stoq.lib.startup import setup, get_option_parser
 
 _ = gettext.gettext
+log = Logger('stoq.main')
 
 def _check_dependencies():
     try:
@@ -68,6 +70,7 @@
 
 def _initialize(options):
     _setup_dialogs()
+    log.info('reading configuration')
     config = StoqConfig(filename=options.filename)
 
     if not config.has_installed_config_data():
@@ -82,6 +85,7 @@
               _("Invalid config file settings, got error '%s', "
                 "of type '%s'" % (value, type)))
 
+    log.info('calling setup()')
     # XXX: progress dialog for connecting (if it takes more than
     # 2 seconds) or creating the database
     try:
@@ -94,7 +98,9 @@
 
 def _run_app(options, appname):
     from stoq.lib.stoqconfig import AppConfig, show_splash
+    log.info('displaying splash screen')
     show_splash('data/pixmaps')
+    log.info('loading application')
     appconf = AppConfig()
     appname = appconf.setup_app(appname, splash=True)
     module = __import__("stoq.gui.%s.app" % appname, globals(), locals(), [''])
@@ -102,13 +108,15 @@
         raise RuntimeError(
             "Application %s must have a app.main() function")
 
+    log.info('running application')
     module.main(appconf)
     import gtk
     gtk.main()
-    appconf.log("Shutting down application")
+    log.info("Shutting down application")
 
 
 def main(args):
+    log.info('parsing command line arguments: %s ' % (args,))
     parser = get_option_parser()
     options, args = parser.parse_args(args)
 
@@ -124,6 +132,7 @@
             raise SystemExit("'%s' is not an application. "
                              "Valid applications are: %s" % (appname, apps))
 
+    log.info('initializing')
     _check_dependencies()
     _initialize(options)
 
@@ -131,6 +140,8 @@
     from stoqlib.lib.drivers import (get_fiscal_printer_settings_by_station,
                                  create_virtual_printer_for_current_station)
     conn = get_connection()
+
+    log.info('setting up printers')
     if not get_fiscal_printer_settings_by_station(conn,
                                               get_current_station(conn)):
         create_virtual_printer_for_current_station()