diff --git a/gpoa/frontend/package_applier.py b/gpoa/frontend/package_applier.py index 339d941..7240f31 100644 --- a/gpoa/frontend/package_applier.py +++ b/gpoa/frontend/package_applier.py @@ -47,6 +47,9 @@ class package_applier(applier_frontend): sync_branch = '{}\\{}%'.format(self.__hklm_branch, self.__sync_key_name) self.fulcmd = list() self.fulcmd.append('/usr/libexec/gpupdate/pkcon_runner') + self.fulcmd.append('--loglevel') + logger = logging.getLogger() + self.fulcmd.append(str(logger.level)) self.install_packages_setting = self.storage.filter_hklm_entries(install_branch) self.remove_packages_setting = self.storage.filter_hklm_entries(remove_branch) self.sync_packages_setting = self.storage.filter_hklm_entries(sync_branch) @@ -101,7 +104,11 @@ class package_applier_user(applier_frontend): self.username = username self.fulcmd = list() self.fulcmd.append('/usr/libexec/gpupdate/pkcon_runner') + self.fulcmd.append('--sid') self.fulcmd.append(self.sid) + self.fulcmd.append('--loglevel') + logger = logging.getLogger() + self.fulcmd.append(str(logger.level)) install_branch = '{}\\{}%'.format(self.__hkcu_branch, self.__install_key_name) remove_branch = '{}\\{}%'.format(self.__hkcu_branch, self.__remove_key_name) @@ -130,12 +137,16 @@ class package_applier_user(applier_frontend): try: subprocess.check_call(self.fulcmd) except Exception as exc: - logging.error(exc) + logdata = dict() + logdata['msg'] = str(exc) + log('E55', logdata) else: try: subprocess.Popen(self.fulcmd,close_fds=False) except Exception as exc: - logging.error(exc) + logdata = dict() + logdata['msg'] = str(exc) + log('E55', logdata) def admin_context_apply(self): ''' diff --git a/gpoa/pkcon_runner b/gpoa/pkcon_runner index c238773..3eb7d2a 100755 --- a/gpoa/pkcon_runner +++ b/gpoa/pkcon_runner @@ -21,7 +21,15 @@ import rpm import subprocess from gpoa.storage import registry_factory import logging +from util.logging import log import argparse +import gettext +import locale +from messages import message_with_code +from util.arguments import ( + set_loglevel +) + def is_rpm_installed(rpm_name): ''' @@ -108,10 +116,16 @@ class Pkcon_applier: logging.debug(exc) if __name__ == '__main__': + locale.bindtextdomain('gpoa', '/usr/lib/python3/site-packages/gpoa/locale') + gettext.bindtextdomain('gpoa', '/usr/lib/python3/site-packages/gpoa/locale') + gettext.textdomain('gpoa') + logger = logging.getLogger() parser = argparse.ArgumentParser(description='Package applier') - parser.add_argument('sid', type = str, help = 'sid', nargs = '?', default = None) + parser.add_argument('--sid', type = str, help = 'sid', nargs = '?', default = None) + parser.add_argument('--loglevel', type = int, help = 'loglevel', nargs = '?', default = 30) args = parser.parse_args() + logger.setLevel(args.loglevel) if args.sid: applier = Pkcon_applier(args.sid) else: