Initial implementation logging for apt1_runner

Author: Korney Gedert

gpoa/apt1_runner

@@ -21,6 +21,7 @@ import rpm
 from gpoa.storage import registry_factory
 from util.util import get_uid_by_username, string_to_literal_eval
 import logging
+from util.logging import log
 import argparse
 import gettext
 import locale
@@ -59,7 +60,7 @@ class Apt_applier:
         dbus_interface = 'org.altlinux.alterator.apt1'
         bus_name = 'org.altlinux.alterator'
         object_path = '/org/altlinux/alterator/apt'
-        
+
         apt_obj = dbus.SystemBus().get_object(bus_name, object_path)
         self.apt_iface = dbus.Interface(apt_obj, dbus_interface)
 
@@ -87,17 +88,22 @@ class Apt_applier:
         Returns:
             response
         """
-        # TODO: add package install/remove logging
+        log('D235')
+
+        log('D148', {'names': self.install_packages})
+        log('D149', {'names': self.remove_packages})
         response = self.apt_iface.ApplyAsync(" ".join(self.remove_packages),
                                              " ".join(map(str, self.install_packages)) + " ".join(
                                                  map(remove_suffix, self.remove_packages)))
         if response != 0:
             remove_packages = filter(is_rpm_installed, self.remove_packages)
             install_packages = filter(is_rpm_notinstalled, self.install_packages)
             for package in remove_packages:
-                self.apt_iface.ApplyAsync(package, remove_suffix(package))
+                if self.apt_iface.ApplyAsync(package, remove_suffix(package)) != 0:
+                    log('E58', {'name': package})
             for package in install_packages:
-                self.apt_iface.ApplyAsync(package, package)
+                if self.apt_iface.ApplyAsync(package, package) != 0:
+                    log('E57', {'name': package})
 
         print(f"ApplyAsync started with response code: {response}")
         return response
@@ -110,8 +116,9 @@ class Apt_applier:
         Returns:
             response
         """
-        # TODO: add update logging
         response = self.apt_iface.UpdateAsync()
+        log('D143')
+        # TODO: Write output into log
         print(f"UpdateAsync started with response code: {response}")
         return response
 

gpoa/frontend/package_applier.py

@@ -57,12 +57,12 @@ def __init__(self, storage):
         remove_branch = '{}\\{}%'.format(self.__hklm_branch, self.__remove_key_name)
         sync_branch = '{}\\{}%'.format(self.__hklm_branch, self.__sync_key_name)
         if check_apt1():
-            runner = '/usr/libexec/gpupdate/apt1_runner'
+            self.runner = 'apt1_runner'
         else:
-            runner = '/usr/libexec/gpupdate/pkcon_runner'
+            self.runner = 'pkcon_runner'
 
         self.fulcmd = []
-        self.fulcmd.append(runner)
+        self.fulcmd.append('/usr/libexec/gpupdate/' + self.runner)
         self.fulcmd.append('--loglevel')
         logger = logging.getLogger()
         self.fulcmd.append(str(logger.level))
@@ -86,13 +86,19 @@ def run(self):
                     subprocess.check_call(self.fulcmd)
                 except Exception as exc:
                     logdata = {'msg': str(exc)}
-                    log('E55', logdata)
+                    if self.runner == 'pkcon_runner':
+                        log('E55', logdata)
+                    elif self.runner == 'apt1_runner':
+                        log('E79', logdata)
             else:
                 try:
                     subprocess.Popen(self.fulcmd,close_fds=False)
                 except Exception as exc:
                     logdata = {'msg': str(exc)}
-                    log('E61', logdata)
+                    if self.runner == 'pkcon_runner':
+                        log('E61', logdata)
+                    elif self.runner == 'apt1_runner':
+                        log('E80', logdata)
 
     def apply(self):
         if self.__module_enabled:
@@ -112,15 +118,17 @@ class package_applier_user(applier_frontend):
     __hkcu_branch = 'Software\\BaseALT\\Policies\\Packages'
 
     def __init__(self, storage, username):
+        log('D901')
         if check_apt1():
-            runner = '/usr/libexec/gpupdate/apt1_runner'
+            self.runner = 'apt1_runner'
         else:
-            runner = '/usr/libexec/gpupdate/pkcon_runner'
+            self.runner = 'pkcon_runner'
+        log('D902')
 
         self.storage = storage
         self.username = username
         self.fulcmd = []
-        self.fulcmd.append(runner)
+        self.fulcmd.append('/usr/libexec/gpupdate/' + self.runner)
         self.fulcmd.append('--user')
         self.fulcmd.append(self.username)
         self.fulcmd.append('--loglevel')
@@ -155,13 +163,19 @@ def run(self):
                     subprocess.check_call(self.fulcmd)
                 except Exception as exc:
                     logdata = {'msg': str(exc)}
-                    log('E60', logdata)
+                    if self.runner == 'pkcon_runner':
+                        log('E60', logdata)
+                    elif self.runner == 'apt1_runner':
+                        log('E77', logdata)
             else:
                 try:
                     subprocess.Popen(self.fulcmd,close_fds=False)
                 except Exception as exc:
                     logdata = {'msg': str(exc)}
-                    log('E62', logdata)
+                    if self.runner == 'pkcon_runner':
+                        log('E62', logdata)
+                    elif self.runner == 'apt1_runner':
+                        log('E78', logdata)
 
     def admin_context_apply(self):
         '''

gpoa/locale/ru_RU/LC_MESSAGES/gpoa.po

@@ -268,6 +268,18 @@ msgstr "Не удалось обновить LDAP новыми данными п
 msgid "Failed to change local user password"
 msgstr "Не удалось изменить пароль локального пользователя"
 
+msgid "Error running apt1_runner sync for user"
+msgstr "Ошибка при запуске apt1_runner синхронно для пользователя"
+
+msgid "Error running apt1_runner async for user"
+msgstr "Ошибка при запуске apt1_runner асинхронно для пользователя"
+
+msgid "Error running apt1_runner sync for machine"
+msgstr "Ошибка при запуске apt1_runner синхронно для компьютера"
+
+msgid "Error running apt1_runner async for machine"
+msgstr "Ошибка при запуске apt1_runner асинхронно для компьютера"
+
 # Error_end
 
 # Debug
@@ -958,6 +970,9 @@ msgstr "Расчет времени с момента первого входа
 msgid "No logins found after password change"
 msgstr "Не найдены входы после изменения пароля"
 
+msgid "Running apt1_runner to install and remove packages"
+msgstr "Запуск pkcon_runner для установки и удаления пакетов"
+
 msgid "Unknown message type, no message assigned"
 msgstr "Неизвестный тип сообщения"
 

gpoa/messages/__init__.py

@@ -112,6 +112,11 @@ def error_code(code):
     error_ids[74] = 'Autofs restart failed'
     error_ids[75] = 'Failed to update LDAP with new password data'
     error_ids[76] = 'Failed to change local user password'
+    error_ids[77] = 'Error running apt1_runner sync for user'
+    error_ids[78] = 'Error running apt1_runner async for user'
+    error_ids[79] = 'Error running apt1_runner sync for machine'
+    error_ids[80] = 'Error running apt1_runner async for machine'
+
     return error_ids.get(code, 'Unknown error code')
 
 def debug_code(code):
@@ -349,6 +354,7 @@ def debug_code(code):
     debug_ids[232] = 'No user login records found'
     debug_ids[233] = 'Calculating time since the first user login after their password change'
     debug_ids[234] = 'No logins found after password change'
+    debug_ids[235] = 'Running apt1_runner to install and remove packages'
 
     return debug_ids.get(code, 'Unknown debug code')