[PyWebMail-Checkins] webmail/webmail/frontends ntservice.py, 1.7, 1.8

[Michael D. <du...@us...>]

Update of /cvsroot/pywebmail/webmail/webmail/frontends
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31285

Modified Files:
	ntservice.py 
Log Message:
Better logging

Index: ntservice.py
===================================================================
RCS file: /cvsroot/pywebmail/webmail/webmail/frontends/ntservice.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ntservice.py	22 Apr 2007 00:44:36 -0000	1.7
--- ntservice.py	2 Mar 2008 16:01:12 -0000	1.8
***************
*** 19,22 ****
--- 19,24 ----
  
  class ServiceSetupMixin(win32serviceutil.ServiceFramework):
+   nt_setup_logging_done = 0
+ 
    def create_config(self, progname, config_file):
      return webmail.client.config.NTServiceConfig(progname, config_file)
***************
*** 38,42 ****
      self.usage_lines = None
      self.continue_event = threading.Event()
!     self.setup_logging_done = 0
      self.init_step()
      try:
--- 40,48 ----
      self.usage_lines = None
      self.continue_event = threading.Event()
!     self.init_step()
!     if len(argv) > 1:
!       logging.root.setLevel(logging.NOTSET)
!       self.nt_setup_logging()
!       webmail.utils.xlogging.appConfig(verbose=webmail.utils.xlogging.max_verbose)
      self.init_step()
      try:
***************
*** 52,56 ****
        self.init_step()
        logging.root.setLevel(logging.NOTSET)
!       if not self.setup_logging_done: self.setup_logging()
        if self.usage_lines:
          excobj = sys.exc_info()[1]
--- 58,62 ----
        self.init_step()
        logging.root.setLevel(logging.NOTSET)
!       self.setup_logging()
        if self.usage_lines:
          excobj = sys.exc_info()[1]
***************
*** 85,101 ****
      self.ReportServiceStatus(self.service_status)
  
    def setup_logging(self):
      if not self.__ServerSetup.setup_logging(self): return 0
!     self._setup_logging()
!     self.setup_logging_done = 1
      return 1
  
!   def _setup_logging(self):
!     hdlr = logging.handlers.NTEventLogHandler(self._svc_display_name_)
!     hdlr.setLevel(logging.root.level+1)
      #time and level already in log entry
      fmt = logging.Formatter("%(name)s:\n%(message)s")
!     hdlr.setFormatter(fmt)
!     logging.root.addHandler(hdlr)
  
    def SvcRun(self):
--- 91,115 ----
      self.ReportServiceStatus(self.service_status)
  
+   def presetup_logging(self):
+     if not self.__ServerSetup.presetup_logging(self): return 0
+     self.nt_setup_logging()
+     return 1
+ 
    def setup_logging(self):
      if not self.__ServerSetup.setup_logging(self): return 0
!     self.nt_setup_logging()
      return 1
  
!   def nt_setup_logging(self):
!     if self.nt_setup_logging_done:
!       self.nt_setup_logging_hdlr.setLevel(logging.root.level+1)
!       return
!     self.nt_setup_logging_hdlr = logging.handlers.NTEventLogHandler(self._svc_display_name_)
!     self.nt_setup_logging_hdlr.setLevel(logging.root.level+1)
      #time and level already in log entry
      fmt = logging.Formatter("%(name)s:\n%(message)s")
!     self.nt_setup_logging_hdlr.setFormatter(fmt)
!     logging.root.addHandler(self.nt_setup_logging_hdlr)
!     self.nt_setup_logging_done = 1
  
    def SvcRun(self):