Clean log levels

maxint · Jun 4, 2015 · 889ace2 · 889ace2
1 parent 3ebe7d1
commit 889ace2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/kpfuse/cache.py b/kpfuse/cache.py
@@ -70,13 +70,13 @@ def open(self, kp, flags):
             cache_mtime = os.path.getmtime(self.cache_path) if os.path.exists(self.cache_path) else 0
             log.debug(u'modified time (%s -> %s): %s', cache_mtime, self.node.attribute.mtime, self.node.path)
             if cache_mtime < self.node.attribute.mtime and len(self._data) != self.node.attribute.size:
-                log.info(u'from net (size=%d -> %d): %s', len(self._data), self.node.attribute.size, self.node.path)
+                log.debug(u'from net (size=%d -> %d): %s', len(self._data), self.node.attribute.size, self.node.path)
                 self._data = ''
                 self.raw = kp.download(self.node.path).raw
             else:
                 if cache_mtime > self.node.attribute.mtime:
                     self.modified = NOT_UPLOADED  # previous not-uploaded _cache_dict
-                log.info(u'open cache: %s', self.node.path)
+                log.debug(u'open cache: %s', self.node.path)
                 self._open_cache()
 
     def create(self):
@@ -172,7 +172,7 @@ def download(self, size):
                 return False
 
             assert len(self._data) == self.node.attribute.size
-            log.debug(u'complete download: %s (%d)', self.node.path, len(self._data))
+            log.info(u'complete download: %s (%d)', self.node.path, len(self._data))
             self.raw.close()
             self.raw = None
             self._write_cache()
@@ -198,7 +198,7 @@ def upload(self, kp):
             self.modified = NOT_MODIFIED
 
     def _write_cache(self):
-        log.info(u'writing to cache: %s', self.node.path)
+        log.debug(u'writing to cache: %s', self.node.path)
         cache_dir = os.path.dirname(self.cache_path)
         if not os.path.exists(cache_dir):
             os.makedirs(cache_dir)

diff --git a/kpfuse/launch.py b/kpfuse/launch.py
@@ -91,19 +91,21 @@ def save_key_cache(kp, username):
     """
     make_dirs(get_profile_dir(username))
     cache_path = get_key_cache_path(username)
-    log.debug('Save cached key to %s', cache_path)
+    log.info('Save cached key to %s', cache_path)
     kp.save(cache_path)
 
 
-def create_logger(verbose=False, **kwargs):
+def create_logger(foreground=False, verbose=False, **kwargs):
     setup_logging(os.path.join(os.path.dirname(__file__), 'logging.json'), **kwargs)
-    if not verbose:
+    if not foreground:
         remove_log_handler('kpfuse', 'console')
-        log.debug('Disable console output')
+        log.info('Disable console output')
+    if verbose:
+        logging.getLogger('kpfuse').setLevel(logging.DEBUG)
 
 
 def launch(mount_point, username, foreground=False, verbose=False):
-    create_logger(verbose)
+    create_logger(foreground, verbose)
 
     log.info('Mount point: %s', mount_point)
     fuse_op = create_kuaipan_fuse_operations(username)
@@ -132,7 +134,7 @@ def readable_dir(path):
     parser.add_argument('mount_point', type=readable_dir,
                         help='Mount point directory')
     parser.add_argument('-D', '--verbose', action='store_true',
-                        help='Enable logging')
+                        help='Enable debug logging')
     parser.add_argument('--foreground', '-f', action='store_true',
                         help='Run in foreground, for debug')
     parser.add_argument('-u', '--username', nargs='?',

diff --git a/kpfuse/logging.json b/kpfuse/logging.json
@@ -12,13 +12,11 @@
   "handlers": {
     "console": {
       "class": "logging.StreamHandler",
-      "level": "DEBUG",
       "formatter": "simple",
       "stream": "ext://sys.stdout"
     },
     "file_handler": {
       "class": "logging.handlers.RotatingFileHandler",
-      "level": "DEBUG",
       "formatter": "standard",
       "filename": "/tmp/kpfuse.log",
       "maxBytes": 10485760,
@@ -28,7 +26,7 @@
   },
   "loggers": {
     "kpfuse": {
-      "level": "DEBUG",
+      "level": "INFO",
       "handlers": [
         "console",
         "file_handler"