Changeset 950 in tailor

Timestamp:

10/23/05 02:39:24 (8 years ago)

Author:

lele@…

Hash name:

20051023003924-97f81-95a5c8ea2801ce0619255253137802a3f99f9ab3

Message:

Remove the logging handler at destruction time
Also, shutup the console handler when --verbose is not given.

File:

• vcpx/project.py (modified) (3 diffs)

vcpx/project.py

@@ -100 +100 @@
         from os import makedirs
         from os.path import join, exists, expanduser, abspath
-        from logging import FileHandler, getLogger, DEBUG, Formatter
+        from logging import getLogger, CRITICAL, DEBUG, FileHandler, \
+             StreamHandler, Formatter
 
         self.verbose = self.config.get(self.name, 'verbose', False)
@@ -111 +112 @@
         if not self.subdir:
             self.subdir = '.'
+
+        self.logfile = join(self.rootdir, self.name + '.log')
+        self.log = getLogger('tailor.project.%s' % self.name)
+        if self.config.get(self.name, 'debug'):
+            self.log.setLevel(DEBUG)
+        tailorlog = getLogger('tailor')
+        formatter = Formatter(self.config.get(
+            self.name, 'log-format',
+            '%(asctime)s %(levelname)8s: %(message)s', raw=True),
+                              self.config.get(
+            self.name, 'log-datefmt', '%Y-%m-%d %H:%M:%S', raw=True))
+        self.loghandler = FileHandler(self.logfile)
+        self.loghandler.setFormatter(formatter)
+        self.loghandler.setLevel(DEBUG)
+        tailorlog.addHandler(self.loghandler)
 
         self.source = self.__loadRepository('source')
@@ -136 +152 @@
                                      (self.name, str(e)))
 
-        self.logfile = join(self.rootdir, self.name + '.log')
-        self.log = getLogger('tailor.project.%s' % self.name)
-        if self.config.get(self.name, 'debug'):
-            self.log.setLevel(DEBUG)
-
-        rootlog = getLogger('tailor')
-        formatter = Formatter(self.config.get(
-            self.name, 'log-format',
-            '%(asctime)s %(levelname)8s: %(message)s', raw=True),
-                              self.config.get(
-            self.name, 'log-datefmt', '%Y-%m-%d %H:%M:%S', raw=True))
-        self.loghandler = FileHandler(self.logfile)
-        self.loghandler.setFormatter(formatter)
-        self.loghandler.setLevel(DEBUG)
-        rootlog.addHandler(self.loghandler)
+        if not self.config.get(self.name, 'verbose', False):
+            # Disable console output
+            rootlog = getLogger()
+            rootlog.disabled = True
+            for h in rootlog.handlers:
+                if isinstance(h, StreamHandler):
+                    h.setLevel(CRITICAL)
 
     def __del__(self):
-        getLogger.removeHandler(self.loghandler)
+        from logging import getLogger
+        getLogger('tailor').removeHandler(self.loghandler)
 
     def __loadRepository(self, which):