Added logs with translation for polkit_applier

gpoa/frontend/appliers/polkit.py

@@ -20,7 +20,7 @@ import os
 import jinja2
 import logging
 
-from util.logging import slogm
+from util.logging import slogm, log
 
 class polkit:
     __template_path = '/usr/share/gpupdate/templates'
@@ -46,7 +46,15 @@ class polkit:
             with open(self.outfile, 'w') as f:
                 f.write(text)
 
-            logging.debug(slogm('Generated file {} with arguments {}'.format(self.outfile, self.args)))
+            logdata = dict()
+            logdata['file'] = self.outfile
+            logdata['arguments'] = self.args
+            log('D77', logdata)
+            #logging.debug(slogm('Generated file {} with arguments {}'.format(self.outfile, self.args)))
         except Exception as exc:
-            logging.error(slogm('Unable to generate file {} from {}'.format(self.outfile, self.infilename)))
+            logdata = dict()
+            logdata['file'] = self.outfile
+            logdata['arguments'] = self.args
+            log('E44', logdata)
+            #logging.error(slogm('Unable to generate file {} from {}'.format(self.outfile, self.infilename)))
 

gpoa/frontend/polkit_applier.py

@@ -21,7 +21,7 @@ from .applier_frontend import (
     , check_enabled
 )
 from .appliers.polkit import polkit
-from util.logging import slogm
+from util.logging import slogm, log
 
 import logging
 
@@ -41,10 +41,14 @@ class polkit_applier(applier_frontend):
         template_file = self.__polkit_map[self.__deny_all][0]
         template_vars = self.__polkit_map[self.__deny_all][1]
         if deny_all:
-            logging.debug(slogm('Deny_All setting found: {}'.format(deny_all.data)))
+            #logging.debug(slogm('Deny_All setting found: {}'.format(deny_all.data)))
+            logdata = dict()
+            logdata['Deny_All'] = deny_all.data
+            log('D69', logdata)
             self.__polkit_map[self.__deny_all][1]['Deny_All'] = deny_all.data
         else:
-            logging.debug(slogm('Deny_All setting not found'))
+            log('D71')
+            #logging.debug(slogm('Deny_All setting not found'))
         self.policies = []
         self.policies.append(polkit(template_file, template_vars))
         self.__module_enabled = check_enabled(
@@ -58,11 +62,13 @@ class polkit_applier(applier_frontend):
         Trigger control facility invocation.
         '''
         if self.__module_enabled:
-            logging.debug(slogm('Running Polkit applier for machine'))
+            log('D73')
+            #logging.debug(slogm('Running Polkit applier for machine'))
             for policy in self.policies:
                 policy.generate()
         else:
-            logging.debug(slogm('Polkit applier for machine will not be started'))
+            log('D75')
+            #logging.debug(slogm('Polkit applier for machine will not be started'))
 
 class polkit_applier_user(applier_frontend):
     __module_name = 'PolkitApplierUser'
@@ -83,11 +89,16 @@ class polkit_applier_user(applier_frontend):
         template_file = self.__polkit_map[self.__deny_all][0]
         template_vars = self.__polkit_map[self.__deny_all][1]
         if deny_all:
-            logging.debug(slogm('Deny_All setting for user {} found: {}'.format(self.username, deny_all.data)))
+            logdata = dict()
+            logdata['user'] = self.username
+            logdata['Deny_All'] = deny_all.data
+            log('D70', logdata)
+            #logging.debug(slogm('Deny_All setting for user {} found: {}'.format(self.username, deny_all.data)))
             self.__polkit_map[self.__deny_all][1]['Deny_All'] = deny_all.data
             self.__polkit_map[self.__deny_all][1]['User'] = self.username
         else:
-            logging.debug(slogm('Deny_All setting not found'))
+            log('D72')
+            #logging.debug(slogm('Deny_All setting not found'))
         self.policies = []
         self.policies.append(polkit(template_file, template_vars, self.username))
         self.__module_enabled = check_enabled(
@@ -104,9 +115,11 @@ class polkit_applier_user(applier_frontend):
         Trigger control facility invocation.
         '''
         if self.__module_enabled:
-            logging.debug(slogm('Running Polkit applier for user in administrator context'))
+            log('D74')
+            #logging.debug(slogm('Running Polkit applier for user in administrator context'))
             for policy in self.policies:
                 policy.generate()
         else:
-            logging.debug(slogm('Polkit applier for user in administrator context will not be started'))
+            log('D76')
+            #logging.debug(slogm('Polkit applier for user in administrator context will not be started'))
 

gpoa/locale/ru_RU/LC_MESSAGES/gpoa.po

@@ -150,6 +150,9 @@ msgstr "Не входит в возможные значения для control"
 msgid "Unable to set"
 msgstr "Невозможно установить"
 
+msgid "Unable to generate file"
+msgstr "Невозможно создать файл"
+
 # Debug
 msgid "The GPOA process was started for user"
 msgstr "Произведён запуск GPOA для обновления политик пользователя"
@@ -319,6 +322,34 @@ msgstr "Начато применение Control для машины"
 msgid "Setting control"
 msgstr "Установка control"
 
+msgid "Deny_All setting found"
+msgstr "Deny_All настройка найдена"
+
+msgid "Deny_All setting for user"
+msgstr "Deny_All настройка для пользователя"
+
+msgid "Deny_All setting not found"
+msgstr "Deny_All настройка не найдена"
+
+msgid "Deny_All setting not found for user"
+msgstr "Deny_All настройка не найдена для пользователя"
+
+msgid "Running Polkit applier for machine"
+msgstr "Начато применение настроек Polkit для машины"
+
+msgid "Running Polkit applier for user in administrator context"
+msgstr "Начато применение настроек Polkit пользователя в контексте администратора"
+
+msgid "Polkit applier for machine will not be started"
+msgstr "Polkit для машины не запускается"
+
+msgid "Polkit applier for user in administrator context will not be started"
+msgstr "Polkit для пользователя в контексте администратора не запускается"
+
+msgid "Generated file"
+msgstr "Созданный файл"
+
+
 # Warning
 msgid "Unable to perform gpupdate for non-existent user, will update machine settings"
 msgstr "Невозможно запустить gpupdate для несуществующего пользователя, будут обновлены настройки машины"

gpoa/messages/__init__.py

@@ -71,6 +71,7 @@ def error_code(code):
     error_ids[41] = 'Error getting control'
     error_ids[42] = 'Is not in possible values for control'
     error_ids[43] = 'Unable to set'
+    error_ids[44] = 'Unable to generate file'
 
     return error_ids.get(code, 'Unknown error code')
 
@@ -144,6 +145,15 @@ def debug_code(code):
     debug_ids[66] = 'Delete HKCU branch key error'
     debug_ids[67] = 'Running Control applier for machine'
     debug_ids[68] = 'Setting control'
+    debug_ids[69] = 'Deny_All setting found'
+    debug_ids[70] = 'Deny_All setting for user'
+    debug_ids[71] = 'Deny_All setting not found'
+    debug_ids[72] = 'Deny_All setting not found for user'
+    debug_ids[73] = 'Running Polkit applier for machine'
+    debug_ids[74] = 'Running Polkit applier for user in administrator context'
+    debug_ids[75] = 'Polkit applier for machine will not be started'
+    debug_ids[76] = 'Polkit applier for user in administrator context will not be started'
+    debug_ids[77] = 'Generated file'
 
     return debug_ids.get(code, 'Unknown debug code')