prepare for 1.4.0

config.cfg

@@ -45,6 +45,11 @@ do_depclean=yes
 # do eix-sync on Gentoo
 do_reposync=yes
 
+# do live-rebuild, go-rebuild, rust-rebuild, perl-cleaner etc. on Gentoo
+# set to no if using binary packages that are bumped when needed.
+# Leave as yes on package builders and if not using binary packages.
+do_rebuilds=yes
+
 # to only write to stderr when something unexpected happens or manual action is required
 # set stderr_loglevel to warning
 stderr_loglevel=debug

sau/gentoo.py

@@ -4,6 +4,7 @@ import re
 
 import sau
 import sau.helpers
+import sau.services
 
 EIX_SYNC_PATH='/usr/bin/eix-sync'
 RC_SERVICE_PATH='/sbin/rc-service'
@@ -22,8 +23,7 @@ slot_re = re.compile(r'^(\(~\))?([^\(]+)(\([^\)]+\))$')
 def identify_service_from_bin(exe):
     log = logging.getLogger(sau.LOGNAME)
 
-    with open('/proc/1/comm', 'r') as f:
+    if sau.services.on_systemd():
-        if f.readline().strip() == 'systemd':
         init_script_re = re.compile(r'[^/]*(.*)\.service$')
     else:
         init_script_re = re.compile(r'/etc/init\.d/(.*)')
@@ -61,8 +61,7 @@ def identify_service_from_bin(exe):
 
 def restart_service(service):
     log = logging.getLogger(sau.LOGNAME)
-    with open('/proc/1/comm', 'r') as f:
+    if sau.services.on_systemd():
-        if f.readline().strip() == 'systemd':
         cmd = [ SYSTEMCTL, 'restart', service ]
     else:
         cmd = [ RC_SERVICE_PATH, service, 'restart' ]
@@ -262,6 +261,9 @@ def pkg_upgrade():
             if line.startswith(' * '):
                 log.warning(line)
 
+    ## rebuild as needed
+    do_rebuild = conf.getboolean('default', 'do_rebuilds', fallback=True)
+    if do_rebuilds:
         # from here on we shouldn't need to rebuild the upgraded packages again
         exclude_list = ' --exclude '.join(rebuild_packages.keys()).split()
 
@@ -368,7 +370,7 @@ def pkg_upgrade():
                     log.warning(line)
 
 
-    # Depclean
+    ## Depclean
     if conf.getboolean('default', 'do_depclean', fallback=False):
         cmd = [ EMERGE_PATH, '--color', 'n', '-q', '--depclean' ]
         ret, out, err = sau.helpers.exec_cmd(cmd, timeout=3600)
@@ -386,8 +388,8 @@ def pkg_upgrade():
                     log.warning(line)
 
 
-    # Preserved rebuild
+    ## Preserved rebuild
-    cmd = [ EMERGE_PATH, '--color', 'n', '-q', '@preserved-rebuild' ]
+    cmd = [ EMERGE_PATH, '--color', 'n', '--usepkg-exclude', '*/*', '-q', '@preserved-rebuild' ]
     ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
 
     if ret != 0 or err:

sau/services.py

@@ -10,7 +10,7 @@ import sau.errors
 import sau.helpers
 import sau.platforms
 
-proc_fd_map_re = re.compile(r'^.*(/[^\(]*) \(deleted\)$')
+proc_fd_map_re = re.compile(r'^.*(/(?:usr|lib|opt|etc|s?bin)[^\(]*) \(deleted\)$')
 
 def _warn(policy, msg):
     log = logging.getLogger(sau.LOGNAME)
@@ -28,7 +28,8 @@ def get_deleted_open_files(proc):
             for line in f:
                 match = re.match(proc_fd_map_re, line)
                 if match:
-                    files.add(match.group(1))
+                    fname = match.group(1)
+                    files.add(fname)
         return files
 
     # on FreeBSD psutils open_files() helpfully returns a null path if a file
@@ -75,6 +76,16 @@ def _get_processes():
 
     return check_procs
 
+# Just return True if system is running on systemd
+def on_systemd():
+    try:
+        init_proc = psutil.Process(pid=1)
+        if init_proc.name() == 'systemd':
+            return True
+    except psutil.NoSuchProcess:
+        pass
+    return False
+
 def restart_services():
     log = logging.getLogger(sau.LOGNAME)
     platform = sau.platforms.get_platform()
@@ -84,14 +95,6 @@ def restart_services():
     # wait before the second test
     time.sleep(5)
 
-    on_systemd = False
-    try:
-        init_proc = psutil.Process(pid=1)
-        if init_proc.name() == 'systemd':
-            on_systemd = True
-    except psutil.NoSuchProcess:
-        pass
-
     # perform a second check to remove potential false positives
     service_procs = set()
     retest_procs = set()
@@ -105,7 +108,7 @@ def restart_services():
         except (psutil.NoSuchProcess, psutil.ZombieProcess, psutil.AccessDenied):
             # either of the above exceptions means the process has quit
             continue
-        if on_systemd:
+        if on_systemd():
             service_procs.add(proc)
         else:
             parent = _get_top_parent(proc)
@@ -114,7 +117,6 @@ def restart_services():
         retest_procs.add(proc)
 
     recommend_restart = False
-    processes = {}
     services = {}
     for proc in service_procs:
         if not proc:
@@ -128,43 +130,28 @@ def restart_services():
             log.debug('{} died before it could be restarted'.format(proc))
             continue
 
-        if on_systemd:
-            if proc.pid == 1:
-                log.info("Upgrade of systemd detected; doing daemon-reexec")
-                ret, _out, _err = sau.helpers.exec_cmd([ '/usr/bin/systemctl', 'daemon-reexec' ])
-                continue
-            ret, unit, err = sau.helpers.exec_cmd([ '/usr/bin/systemctl', 'whoami', f'{proc.pid}' ])
-            unit = unit.strip()
-            name, unit_type = unit.split('.')
-            if ret != 0:
-                log.debug(f'Non-success ({ret}) when checking unit for process: {err}')
-                continue
-            elif unit_type != 'service':
-                log.warning(f'not restarting non-service unit "{unit}"; owner of {proc}')
-            elif name.startswith('user@'):
-                log.warning(f'Not restarting user service {unit}; please log out and log in again')
-            else:
-                _ret, enabled, _err = sau.helpers.exec_cmd([ '/usr/bin/systemctl', 'is-enabled', unit ])
-                enabled = enabled.strip()
-                if enabled not in ('enabled', 'static'):
-                    log.warning(f'Unit {name}.service has enable status: {enabled} - will only restart "enabled" services')
-                else:
-                    service_name = name
-        else:
         service_name = _get_service_from_proc(proc)
 
         if not service_name:
             log.warning('no service for process {}'.format(proc))
             recommend_restart = True
             continue
+        if service_name == 'systemd':
+            log.info("Upgrade of systemd detected; doing daemon-reexec")
+            sau.helpers.exec_cmd([ '/usr/bin/systemctl', 'daemon-reexec' ])
+            continue
+        elif service_name == '@ignore':
+            log.info(f"Process {proc} ignored by configuration")
+            retest_procs.discard(proc)
+            continue
 
         services[proc_name] = service_name
-        processes[service_name] = [proc]
 
     for service in set([x for x in services.values() if x]):
         policy = _get_service_restart_policy(service)
         if policy == 'ignore':
             log.info('Service "{}" ignored by configuration'.format(service))
+            [retest_procs.discard(x) for x,y in services.items() if y == service]
             continue
         elif policy == 'warn':
             log.warning('Service "{}" has open deleted files and should be restarted'.format(service))
@@ -209,6 +196,7 @@ def _get_service_restart_policy(service):
 def _get_service_from_proc(proc):
     conf = sau.config
     platform = sau.platforms.get_platform()
+    if not on_systemd():
         proc = _get_top_parent(proc)
     log = logging.getLogger(sau.LOGNAME)
     try:
@@ -216,14 +204,42 @@ def _get_service_from_proc(proc):
         service_exe = proc.exe()
     except (psutil.NoSuchProcess, psutil.ZombieProcess, psutil.AccessDenied):
         log.debug('{} died'.format(proc))
-        return None
+        return '@ignore'
 
     service_name = conf.get('processes', proc_name, fallback=None)
+    log.debug(f'configuration of process "{proc_name}" in config: "{service_name}"')
     if service_name == '':
         log.debug('Ignoring process {}'.format(proc))
-        return None
+        return '@ignore'
 
     if not service_name:
+        # Systemd has it's own way...
+        if on_systemd():
+            if proc.pid == 1:
+                return 'systemd'
+            ret, unit, err = sau.helpers.exec_cmd([ '/usr/bin/systemctl', 'whoami', f'{proc.pid}' ])
+            unit = unit.strip()
+            name, unit_type = unit.split('.')
+            if ret != 0:
+                log.debug(f'Non-success ({ret}) when checking unit for process: {err}')
+                return None
+            elif unit_type != 'service':
+                log.warning(f'not restarting non-service unit "{unit}"; owner of {proc}')
+                return None
+            elif name.startswith('user@'):
+                log.warning(f'Not restarting user service {unit}; please log out and log in again')
+                return None
+            else:
+                _ret, enabled, _err = sau.helpers.exec_cmd([ '/usr/bin/systemctl', 'is-enabled', unit ])
+                enabled = enabled.strip()
+                if enabled not in ('enabled', 'static'):
+                    log.warning(f'Unit {name}.service has enable status: {enabled} - will only restart "enabled" services')
+                    return None
+                else:
+                    return name
+            log.error(f'This should be an unreachable path when checking process {proc}')
+            return None
+
         # if the exe file has been deleted since started, service_exe will be empty
         # and we'll have to guess
         if not service_exe:

setup.py

@@ -1,11 +1,11 @@
-#!/usr/bin/env python3.7
+#!/usr/bin/env python3
 from os import environ
 
 from setuptools import setup, find_packages
 
 setup(
         name='sau',
-        version='1.3.3',
+        version='1.4.0',
         description='Tool for auto-updating OS and packages',
         author='Feffe',
         author_email='feffe@fulh.ax',