summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>2013-03-05 13:18:06 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-03-06 01:35:35 +0900
commit43daf0bad0230671d932a4b1b202a227a5776511 (patch)
tree1083b4a9c9acf98c13e50e8ac11a4f0c493a0b4f
parent998a8ad543058e48f303f422c4585f148c3ae23d (diff)
log-cleanup: honor --default-log-level in case of --verbose
if the default log level is explicitly specified by --default-log-level option, use the level rather than defaulting to logging.DEBUG. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/log.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ryu/log.py b/ryu/log.py
index 5aa515c1..d02d4fc1 100644
--- a/ryu/log.py
+++ b/ryu/log.py
@@ -78,9 +78,9 @@ def init_log():
mode = int(CONF.log_file_mode, 8)
os.chmod(log_file, mode)
- if CONF.verbose:
- log.setLevel(logging.DEBUG)
- elif CONF.default_log_level is not None:
+ if CONF.default_log_level is not None:
log.setLevel(CONF.default_log_level)
+ elif CONF.verbose:
+ log.setLevel(logging.DEBUG)
else:
log.setLevel(logging.INFO)