Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342657 )
Change subject: Decouple logging setup from importing the module
......................................................................
Decouple logging setup from importing the module
Change-Id: I3e5a30abefb0e1bba6e6ee5a3c9e53433d0dcf70
---
M switchdc/log.py
M switchdc/switch.py
2 files changed, 10 insertions(+), 7 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
Volans: Looks good to me, but someone else must approve
diff --git a/switchdc/log.py b/switchdc/log.py
index db644e6..d20d50a 100644
--- a/switchdc/log.py
+++ b/switchdc/log.py
@@ -3,10 +3,11 @@
logger = logging.getLogger(__name__)
-_log_formatter = logging.Formatter(
- fmt='%(asctime)s [%(levelname)s %(filename)s:%(lineno)s in %(funcName)s]
%(message)s')
-_log_handler = logging.FileHandler('/var/log/switchdc.log')
-_log_handler.setFormatter(_log_formatter)
-logger.addHandler(_log_handler)
-logger.raiseExceptions = False
-logger.setLevel(logging.INFO)
+def setup_logging():
+ _log_formatter = logging.Formatter(
+ fmt='%(asctime)s [%(levelname)s %(filename)s:%(lineno)s in
%(funcName)s] %(message)s')
+ _log_handler = logging.FileHandler('/var/log/switchdc.log')
+ _log_handler.setFormatter(_log_formatter)
+ logger.addHandler(_log_handler)
+ logger.raiseExceptions = False
+ logger.setLevel(logging.INFO)
diff --git a/switchdc/switch.py b/switchdc/switch.py
index 3fe8099..5672636 100644
--- a/switchdc/switch.py
+++ b/switchdc/switch.py
@@ -3,6 +3,7 @@
import importlib
import os
+from switchdc import log
from switchdc.menu import Item, Menu
@@ -93,6 +94,7 @@
def main():
"""Entry point, run the tool."""
+ log.setup_logging()
args = parse_args()
menu = generate_menu(args.dc_from, args.dc_to)
--
To view, visit https://gerrit.wikimedia.org/r/342657
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e5a30abefb0e1bba6e6ee5a3c9e53433d0dcf70
Gerrit-PatchSet: 4
Gerrit-Project: operations/switchdc
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
