public/gpupdate
1
0
Fork 1
mirror of https://github.com/altlinux/gpupdate.git synced 2025-03-21 18:50:38 +03:00
Code Releases Wiki Activity

gpt.gpt: Logging improved

Browse Source
This commit is contained in:
Игорь Чудов 2020-07-28 12:06:43 +04:00
parent d9afe438bc
commit 1bf4687d41
Signed by untrusted user: nir
GPG Key ID: 0F3883600CAE7AAC
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gpoa/gpt/gpt.py
View File

@ -74,6 +74,7 @@ from util.paths import (
local_policy_cache
)
from util.logging import slogm
from messages import message_with_code
@unique
@ -150,7 +151,6 @@ class gpt:
self.name = ''
self.guid = self.path.rpartition('/')[2]
self.name = ''
if 'default' == self.guid:
self.guid = 'Local Policy'
@ -176,9 +176,11 @@ class gpt:
for setting in self.settings_list:
machine_preffile = find_preffile(self._machine_path, setting)
user_preffile = find_preffile(self._user_path, setting)
logging.debug('Looking for {} in machine part of GPT {}: {}'.format(setting, self.name, machine_preffile))
mlogdata = dict({'setting': setting, 'prefpath': machine_preffile})
logging.debug(slogm(message_with_code('D24'), mlogdata))
self.settings['machine'][setting] = machine_preffile
logging.debug('Looking for {} in user part of GPT {}: {}'.format(setting, self.name, user_preffile))
ulogdata = dict({'setting': setting, 'prefpath': user_preffile})
logging.debug(slogm(message_with_code('D23'), ulogdata))
self.settings['user'][setting] = user_preffile
def set_name(self, name):
@ -211,17 +213,19 @@ class gpt:
for preference_name, preference_path in self.settings['machine'].items():
if preference_path:
preference_type = get_preftype(preference_path)
logstring = 'Reading and merging {} for {}'.format(preference_type.value, self.sid)
logging.debug(logstring)
logdata = dict({'pref': preference_type.value, 'sid': self.sid})
logging.debug(slogm(message_with_code('D28'), logdata))
preference_parser = get_parser(preference_type)
preference_merger = get_merger(preference_type)
preference_objects = preference_parser(preference_path)
preference_merger(self.storage, self.sid, preference_objects, self.name)
if self.settings['user']['regpol']:
logging.debug(slogm('Merging machine(user) settings from {}'.format(self.settings['machine']['regpol'])))
mulogdata = dict({'polfile': self.settings['machine']['regpol']})
logging.debug(slogm(message_with_code('D35'), mulogdata))
util.preg.merge_polfile(self.settings['user']['regpol'], sid=self.sid, policy_name=self.name)
if self.settings['machine']['regpol']:
logging.debug(slogm('Merging machine settings from {}'.format(self.settings['machine']['regpol'])))
mlogdata = dict({'polfile': self.settings['machine']['regpol']})
logging.debug(slogm(message_with_code('D34'), mlogdata))
util.preg.merge_polfile(self.settings['machine']['regpol'], policy_name=self.name)
else:
# Merge user settings if UserPolicyMode set accordingly
@ -231,8 +235,8 @@ class gpt:
for preference_name, preference_path in self.settings['user'].items():
if preference_path:
preference_type = get_preftype(preference_path)
logstring = 'Reading and merging {} for {}'.format(preference_type.value, self.sid)
logging.debug(logstring)
logdata = dict({'pref': preference_type.value, 'sid': self.sid})
logging.debug(slogm(message_with_code('D29'), logdata))
preference_parser = get_parser(preference_type)
preference_merger = get_merger(preference_type)
preference_objects = preference_parser(preference_path)
@ -330,7 +334,7 @@ def get_local_gpt(sid):
'''
Convert default policy to GPT and create object out of it.
'''
logging.debug(slogm('Re-caching Local Policy'))
logging.debug(slogm(message_with_code('D25')))
lp2gpt()
local_policy = gpt(str(local_policy_cache()), sid)
local_policy.set_name('Local Policy')