mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 06:16:03 +00:00
Code Issues Releases Wiki Activity

Extend common DebugLogger with option to log to stderr

Browse Source 
This makes it possible for e.g. command line tools to have the --debug
option and when invoked print the existing debug messages directly to
stderr so the user running the command can see them.
This commit is contained in:
Otto Kekäläinen
2019-02-04 01:26:25 +02:00
parent 365bb375d5
commit c04a0cadef
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
utils/apparmor/common.py
View File

@@ -255,12 +255,20 @@ def type_is_str(var):
else: else:
return False return False
class DebugLogger(object): class DebugLogger(object):
'''Unified debug facility. Logs to file or stderr.
Does not log anything by default. Will only log if environment variable
LOGPROF_DEBUG is set to a number between 1 and 3 or if method activateStderr
is run.
'''
def __init__(self, module_name=__name__): def __init__(self, module_name=__name__):
self.debugging = False self.debugging = False
self.logfile = '/var/log/apparmor/logprof.log'
self.debug_level = logging.DEBUG self.debug_level = logging.DEBUG
if os.getenv('LOGPROF_DEBUG', False): if os.getenv('LOGPROF_DEBUG', False):
self.logfile = '/var/log/apparmor/logprof.log'
self.debugging = os.getenv('LOGPROF_DEBUG') self.debugging = os.getenv('LOGPROF_DEBUG')
try: try:
self.debugging = int(self.debugging) self.debugging = int(self.debugging)
@@ -272,11 +280,11 @@ class DebugLogger(object):
if self.debugging == 0: # debugging disabled, don't need to setup logging if self.debugging == 0: # debugging disabled, don't need to setup logging
return return
if self.debugging == 1: if self.debugging == 1:
self.debug_level = logging.ERROR self.debug_level = logging.ERROR # 40
elif self.debugging == 2: elif self.debugging == 2:
self.debug_level = logging.INFO self.debug_level = logging.INFO # 20
elif self.debugging == 3: elif self.debugging == 3:
self.debug_level = logging.DEBUG self.debug_level = logging.DEBUG # 10
try: try:
logging.basicConfig(filename=self.logfile, level=self.debug_level, logging.basicConfig(filename=self.logfile, level=self.debug_level,
@@ -292,6 +300,15 @@ class DebugLogger(object):
self.logger = logging.getLogger(module_name) self.logger = logging.getLogger(module_name)
def activateStderr(self):
self.debugging = True
logging.basicConfig(
level=self.debug_level,
format='%(levelname)s: %(message)s',
stream=sys.stderr,
)
self.logger = logging.getLogger(__name__)
def error(self, message): def error(self, message):
if self.debugging: if self.debugging:
self.logger.error(message) self.logger.error(message)