From 5c654e959cc0cd7922b2c0abf354afad40f922c3 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Fri, 20 Aug 2010 15:02:12 +0200
Subject: [PATCH] setup-ssh: redo the logging levels
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
There is not enough logged by default on stderr, and way too much
information in the log file.
Since we don't want to debug paramiko itself, we filter only warnings
and above.
Otherwise, we make WARNINGS the default level, with verbose meaning INFO
and debug, well, DEBUG.
Additionally, a message is improved.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Manuel Franceschini <livewire@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
tools/setup-ssh | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/tools/setup-ssh b/tools/setup-ssh
index 02b6fbf7f..ff9880d55 100755
--- a/tools/setup-ssh
+++ b/tools/setup-ssh
@@ -129,7 +129,7 @@ def SetupSSH(transport):
except IOError:
# Sadly paramiko doesn't provide errno or similiar
# so we can just assume that the path already exists
- logging.info("Path %s seems already to exist on remote node. Ignore.",
+ logging.info("Path %s seems already to exist on remote node. Ignoring.",
auth_path)
for name, (data, perm) in filemap.iteritems():
@@ -192,23 +192,25 @@ def SetupLogging(options):
stderr_handler = logging.StreamHandler()
stderr_handler.setFormatter(formatter)
file_handler.setFormatter(formatter)
- file_handler.setLevel(logging.DEBUG)
+ file_handler.setLevel(logging.INFO)
if options.debug:
- stderr_handler.setLevel(logging.NOTSET)
+ stderr_handler.setLevel(logging.DEBUG)
elif options.verbose:
stderr_handler.setLevel(logging.INFO)
else:
- stderr_handler.setLevel(logging.ERROR)
+ stderr_handler.setLevel(logging.WARNING)
root_logger = logging.getLogger("")
- root_logger.setLevel(logging.NOTSET)
+ root_logger.setLevel(logging.INFO)
root_logger.addHandler(stderr_handler)
root_logger.addHandler(file_handler)
# This is the paramiko logger instance
paramiko_logger = logging.getLogger("paramiko")
paramiko_logger.addHandler(file_handler)
+ # We don't want to debug Paramiko, so filter anything below warning
+ paramiko_logger.setLevel(logging.WARNING)
def main():
--
GitLab