Skip to content

Commit 77f3ffc

Browse files
committed
Fix logging to work with python 2.6
Python 2.6 has a number of different areas: o setLevel silently ignores non integers, so strings cannot be used. o getLogger at the top level needs to be 'root' if submodules are to inherit correctly. Tidied up the library logging definition to follow the root logger. Addresses Issue: RedHatOfficial#67
1 parent 34a43bb commit 77f3ffc

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

rhsda.py

+1-8
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,7 @@
3131

3232

3333
# Logging
34-
logging.addLevelName(25, 'NOTICE')
35-
consolehandler = logging.StreamHandler()
36-
consolehandler.setLevel('DEBUG')
37-
consolehandler.setFormatter(logging.Formatter("[%(levelname)-7s] %(name)s: %(message)s"))
38-
logger = logging.getLogger('rhsda')
39-
logger.setLevel('NOTICE')
40-
logger.addHandler(consolehandler)
34+
logger = logging.getLogger(__name__)
4135

4236

4337
# Establish cveFields namespace
@@ -176,7 +170,6 @@ class ApiClient:
176170
def __init__(self, logLevel='notice'):
177171
self.cfg = Namespace()
178172
self.cfg.apiUrl = 'https://access.redhat.com/labs/securitydataapi'
179-
logger.setLevel(logLevel.upper())
180173

181174
def _get_terminal_width(self):
182175
h, w, hp, wp = struct.unpack('HHHH', fcntl.ioctl(0, termios.TIOCGWINSZ, struct.pack('HHHH', 0, 0, 0, 0)))

rhsecapi.py

+11-5
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,21 @@
4848
vers = {}
4949
vers['version'] = '1.0.1'
5050
vers['date'] = '2017/06/27'
51+
logLevels = {
52+
'DEBUG': logging.DEBUG,
53+
'INFO': logging.INFO,
54+
'WARNING': logging.WARNING,
55+
'NOTICE': 25,
56+
'ERROR': logging.ERROR,
57+
}
58+
5159

5260

5361
# Logging
54-
logging.addLevelName(25, 'NOTICE')
62+
logging.addLevelName(logLevels['NOTICE'], 'NOTICE')
5563
consolehandler = logging.StreamHandler()
56-
consolehandler.setLevel('DEBUG')
5764
consolehandler.setFormatter(logging.Formatter("[%(levelname)-7s] %(name)s: %(message)s"))
58-
logger = logging.getLogger('rhsecapi')
59-
logger.setLevel('NOTICE')
65+
logger = logging.getLogger()
6066
logger.addHandler(consolehandler)
6167

6268

@@ -340,7 +346,7 @@ def parse_args():
340346
o.outFormat = 'jsonpretty'
341347
else:
342348
o.outFormat = 'plaintext'
343-
logger.setLevel(o.loglevel.upper())
349+
logger.setLevel(logLevels[o.loglevel.upper()])
344350
return o
345351

346352

0 commit comments

Comments
 (0)