From 8b13e32ed7d70bf5931f2466dce8f306fe374aa7 Mon Sep 17 00:00:00 2001
From: Markus Zolliker <markus.zolliker@psi.ch>
Date: Thu, 27 Jun 2024 15:37:59 +0200
Subject: [PATCH] some more cosmetic changes

- fix an intend
- add TODO: remove pkg
- add .before_bott_at to backup of seastatus.tcl
---
 base.py      | 1 +
 frappyman.py | 9 +++------
 seaman.py    | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/base.py b/base.py
index 9986ddb..7717f54 100644
--- a/base.py
+++ b/base.py
@@ -339,6 +339,7 @@ class ServiceManager:
             services = to_start
         for service_i in services:
             port = service_ports[service_i]
+            # TODO: remove unused pkg
             cmd = self.commands[ins] % dict(ins=ins, serv=service_i, port=port, cfg=cfg, pkg=self.pkg or ins)
             if opts:
                 cmd = f'{cmd} {opts}'
diff --git a/frappyman.py b/frappyman.py
index 5fc2686..02b95f4 100644
--- a/frappyman.py
+++ b/frappyman.py
@@ -138,9 +138,9 @@ class FrappyManager(ServiceManager):
         start_dir, env = super().prepare_start(ins, service)
         env_update = {}
         for key, value in env.items():
-             if '<SERV>' in value:
-                 env_update[key] = value.replace('<SERV>', service)
-                 os.environ[key] = env[key]
+            if '<SERV>' in value:
+                env_update[key] = value.replace('<SERV>', service)
+                os.environ[key] = env[key]
         cfgpaths = self.config_dirs(ins, service)
         if cfgpaths:
             env_update['FRAPPY_CONFDIR'] = os.pathsep.join(cfgpaths)
@@ -404,7 +404,6 @@ class FrappyManager(ServiceManager):
         if proposed_addons:  # and set(proposed_addons) != set(running_addons):
             proposed_cfg['addons'] = {','.join(proposed_addons)}
 
-        self._debug = {}
         for service in FrappyManager.services:
             given = givencfgs.get(service)
             running = self.frappy_cfgs.get(service)
@@ -413,8 +412,6 @@ class FrappyManager(ServiceManager):
             if running:
                 self.state[f'frappy {service}'] = running
 
-            self._debug[service] = (seaconfig, available, running, running in self.frappy2sea)
-
             if seaconfig and (available or running in self.frappy2sea):
                 # we get here when the sea server is running and either at least one of:
                 # - the sea config is matching any frappy cfg
diff --git a/seaman.py b/seaman.py
index c438166..2ba7501 100644
--- a/seaman.py
+++ b/seaman.py
@@ -117,7 +117,7 @@ class SeaManager(ServiceManager):
             seastatus = self.get_status_filename(ins)
             if seastatus:
                 boot_time = time.strftime("%Y-%m-%dT%H-%M-%S", time.localtime(psutil.boot_time()))
-                dst = seastatus.replace('.tcl', '') + '.' + boot_time
+                dst = seastatus.replace('.tcl', '') + '.before_boot_at' + boot_time
                 if not exists(dst):
                     os.system(f'cp {seastatus} {dst}')
         return start_dir, env