Structured logging improved (message list expanded)

gpoa/messages/__init__.py

@@ -18,15 +18,8 @@
 
 def info_code(code):
     info_ids = dict()
-    info_ids[1] = 'Starting GPOA via command invocation'
-    info_ids[2] = 'Starting GPOA via D-Bus'
-    info_ids[3] = 'Group Policy target set for update'
-    info_ids[4] = 'Initializing Samba backend for domain'
-    info_ids[5] = 'Initializing local backend without domain'
-    info_ids[6] = 'Cache directory determined'
-    info_ids[7] = 'Initializing plugin manager'
-    info_ids[8] = 'ADP plugin initialized'
-    info_ids[9] = 'Running ADP plugin'
+    info_ids[1] = 'Got GPO list for username'
+    info_ids[2] = 'Got GPO'
 
     return info_ids.get(code, 'Unknown info code')
 
@@ -41,13 +34,54 @@ def error_code(code):
     error_ids[7] = 'Unable to initialize Samba backend'
     error_ids[8] = 'Unable to initialize no-domain backend'
     error_ids[9] = 'Error running ADP'
+    error_ids[10] = 'Unable to determine DC hostname'
+    error_ids[11] = 'Error occured while running applier with user privileges'
+    error_ids[12] = 'Unable to initialize backend'
+    error_ids[13] = 'Not sufficient privileges to run machine appliers'
+    error_ids[14] = 'Kerberos ticket check failed'
+    error_ids[15] = 'Unable to retrieve domain name via CLDAP query'
+    error_ids[16] = 'Error getting SID using wbinfo, will use SID from cache'
+    error_ids[17] = 'Unable to get GPO list for user from AD DC'
 
     return error_ids.get(code, 'Unknown error code')
 
 def debug_code(code):
     debug_ids = dict()
     debug_ids[1] = 'The GPOA process was started for user'
-    debug_ids[2] = ''
+    debug_ids[2] = 'Username is not specified - will use username of the current process'
+    debug_ids[3] = 'Initializing plugin manager'
+    debug_ids[4] = 'ADP plugin initialized'
+    debug_ids[5] = 'Running ADP plugin'
+    debug_ids[6] = 'Starting GPOA for user via D-Bus'
+    debug_ids[7] = 'Cache directory determined'
+    debug_ids[8] = 'Initializing local backend without domain'
+    debug_ids[9] = 'Initializing Samba backend for domain'
+    debug_ids[10] = 'Group Policy target set for update'
+    debug_ids[11] = 'Starting GPOA for computer via D-Bus'
+    debug_ids[12] = 'Got exit code'
+    debug_ids[13] = 'Starting GPOA via D-Bus'
+    debug_ids[14] = 'Starting GPOA via command invocation'
+    debug_ids[15] = 'Username for frontend is determined'
+    debug_ids[16] = 'Applying computer part of settings'
+    debug_ids[17] = 'Kerberos ticket check succeed'
+    debug_ids[18] = 'Found AD domain via CLDAP query'
+    debug_ids[19] = 'Setting info'
+    debug_ids[20] = 'Initializing cache'
+    debug_ids[21] = 'Set operational SID'
+    debug_ids[22] = 'Got PReg entry'
+    debug_ids[23] = 'Looking for preference in user part of GPT'
+    debug_ids[24] = 'Looking for preference in machine part of GPT'
+    debug_ids[25] = 'Re-caching Local Policy'
+    debug_ids[26] = 'Adding HKCU entry'
+    debug_ids[27] = 'Skipping branch deletion key'
+    debug_ids[28] = 'Reading and merging machine preference'
+    debug_ids[29] = 'Reading and merging user preference'
+    debug_ids[30] = 'Found SYSVOL entry'
+    debug_ids[31] = 'Trying to load PReg from .pol file'
+    debug_ids[32] = 'Finished reading PReg from .pol file'
+    debug_ids[33] = 'Determined length of PReg file'
+    debug_ids[34] = 'Merging machine settings from PReg file'
+    debug_ids[35] = 'Merging machine (user part) settings from PReg file'
 
     return debug_ids.get(code, 'Unknown debug code')
 
@@ -59,7 +93,7 @@ def warning_code(code):
     )
     warning_ids[2] = (
         'Current permissions does not allow to perform gpupdate for '
-        'designted user. Will update current user settings'
+        'designated user. Will update current user settings'
     )
     warning_ids[3] = 'oddjobd is inaccessible'
     warning_ids[4] = 'No SYSVOL entry assigned to GPO'
@@ -82,7 +116,7 @@ def get_message(code):
     return retstr
 
 def message_with_code(code):
-    retstr = '[' + code[0:1] + code[1:].rjust(5, '0') + ']: ' + get_message(code)
+    retstr = '[' + code[0:1] + code[1:].rjust(5, '0') + ']| ' + get_message(code)
 
     return retstr