From 49b11bfa817807e4bd44ed57b08c0dd75f90895b Mon Sep 17 00:00:00 2001 From: l_samenv Date: Tue, 14 Nov 2023 11:56:52 +0100 Subject: [PATCH] fix copy seastatus --- seaman.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/seaman.py b/seaman.py index d83ec1d..268375e 100644 --- a/seaman.py +++ b/seaman.py @@ -115,7 +115,7 @@ class SeaManager(ServiceManager): os.system('cp %s ./' % sea_server_src) if service == 'sea': # debugging: copy status file in case of a reboot - seastatus = self.get_sea_status(ins) + 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 @@ -123,7 +123,7 @@ class SeaManager(ServiceManager): os.system(f'cp {seastatus} {dst}') return start_dir, env - def get_sea_status_file(self, ins): + def get_status_filename(self, ins): searoot = self.env[ins].get('SEA_ROOT', '') seastatus = join(searoot, ins, 'status', 'seastatus.tcl') if exists(seastatus): @@ -143,7 +143,7 @@ class SeaManager(ServiceManager): if 'sea' not in self.get_procs().get(ins, ()): return '' try: - seastatus = self.get_sea_status(ins) + seastatus = self.get_status_filename(ins) if not seastatus: return '?' result = ['', ''] @@ -197,4 +197,8 @@ class SeaManager(ServiceManager): argdict['ins'] = arg else: raise UsageError('unknown argument: %s' % arg) - return [argdict.pop('ins', '')] + extra + result = [argdict.pop('ins', '')] + service = argdict.pop('service', '') + if service: + result.append(service) + return result + extra