1 files changed, 26 insertions, 37 deletions

diff --git a/python/vyos/migrator.py b/python/vyos/migrator.py
index 45ea8b0eb..87c74e1ea 100644
--- a/python/vyos/migrator.py
+++ b/python/vyos/migrator.py
@@ -16,9 +16,13 @@
 import sys
 import os
 import json
-import subprocess
+import logging
+
 import vyos.defaults
 import vyos.component_version as component_version
+from vyos.util import cmd
+
+log_file = os.path.join(vyos.defaults.directories['config'], 'vyos-migrate.log')
 
 class MigratorError(Exception):
     pass
@@ -29,9 +33,21 @@ class Migrator(object):
         self._force = force
         self._set_vintage = set_vintage
         self._config_file_vintage = None
-        self._log_file = None
         self._changed = False
 
+    def init_logger(self):
+        self.logger = logging.getLogger(__name__)
+        self.logger.setLevel(logging.DEBUG)
+
+        # on adding the file handler, allow write permission for cfg_group;
+        # restore original umask on exit
+        mask = os.umask(0o113)
+        fh = logging.FileHandler(log_file)
+        formatter = logging.Formatter('%(message)s')
+        fh.setFormatter(formatter)
+        self.logger.addHandler(fh)
+        os.umask(mask)
+
     def read_config_file_versions(self):
         """
         Get component versions from config file footer and set vintage;
@@ -68,34 +84,15 @@ class Migrator(object):
         else:
             return True
 
-    def open_log_file(self):
-        """
-        Open log file for migration, catching any error.
-        Note that, on boot, migration takes place before the canonical log
-        directory is created, hence write to the config file directory.
-        """
-        self._log_file = os.path.join(vyos.defaults.directories['config'],
-                                      'vyos-migrate.log')
-        # on creation, allow write permission for cfg_group;
-        # restore original umask on exit
-        mask = os.umask(0o113)
-        try:
-            log = open('{0}'.format(self._log_file), 'w')
-            log.write("List of executed migration scripts:\n")
-        except Exception as e:
-            os.umask(mask)
-            print("Logging error: {0}".format(e))
-            return None
-
-        os.umask(mask)
-        return log
-
     def run_migration_scripts(self, config_file_versions, system_versions):
         """
         Run migration scripts iteratively, until config file version equals
         system component version.
         """
-        log = self.open_log_file()
+        os.environ['VYOS_MIGRATION'] = '1'
+        self.init_logger()
+
+        self.logger.info("List of executed migration scripts:")
 
         cfg_versions = config_file_versions
         sys_versions = system_versions
@@ -127,8 +124,9 @@ class Migrator(object):
                         '{}-to-{}'.format(cfg_ver, next_ver))
 
                 try:
-                    subprocess.check_call([migrate_script,
-                        self._config_file])
+                    out = cmd([migrate_script, self._config_file])
+                    self.logger.info(f'{migrate_script}')
+                    if out: self.logger.info(out)
                 except FileNotFoundError:
                     pass
                 except Exception as err:
@@ -136,19 +134,10 @@ class Migrator(object):
                           "".format(migrate_script, err))
                     sys.exit(1)
 
-                if log:
-                    try:
-                        log.write('{0}\n'.format(migrate_script))
-                    except Exception as e:
-                        print("Error writing log: {0}".format(e))
-
                 cfg_ver = next_ver
-
             rev_versions[key] = cfg_ver
 
-        if log:
-            log.close()
-
+        del os.environ['VYOS_MIGRATION']
         return rev_versions
 
     def write_config_file_versions(self, cfg_versions):