diff options
author | ms <ms@taler.net> | 2022-01-13 10:14:28 +0100 |
---|---|---|
committer | ms <ms@taler.net> | 2022-01-13 10:14:28 +0100 |
commit | 60d32ed5f36dd478e7e91118d66acc9e4d2e2392 (patch) | |
tree | a729ba966d197e4c3852af89a50584b88876c113 | |
parent | 2732c2740260aa38c2f5980c82d06baec6340a08 (diff) | |
download | deployment-60d32ed5f36dd478e7e91118d66acc9e4d2e2392.tar.gz deployment-60d32ed5f36dd478e7e91118d66acc9e4d2e2392.tar.bz2 deployment-60d32ed5f36dd478e7e91118d66acc9e4d2e2392.zip |
taler-local: fix logging
-rwxr-xr-x | bin/WIP/taler-local | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/bin/WIP/taler-local b/bin/WIP/taler-local index 76b9ffe..89ea0ad 100755 --- a/bin/WIP/taler-local +++ b/bin/WIP/taler-local @@ -31,7 +31,7 @@ import random import logging import json from os import listdir -from os.path import isdir, join +from os.path import isdir, join, basename from pathlib import Path from typing import List, Callable from shutil import copy @@ -493,7 +493,6 @@ def prepare(x_forwarded_host, x_forwarded_proto, postgres_db_name): def fail(reason=None): if reason: print("ERROR:", reason) - print(f"Logs in {LOG_DIR}") exit(1) def kill(proc): @@ -762,7 +761,7 @@ def prepare(x_forwarded_host, x_forwarded_proto, postgres_db_name): ): if len(cmd) == 0: fail("Command to execute was given empty.") - self.name = custom_name if custom_name else cmd[0] + self.name = custom_name if custom_name else basename(cmd[0]) self.cmd = cmd self.capture_stdout = capture_stdout self.log_dir = log_dir @@ -771,9 +770,9 @@ def prepare(x_forwarded_host, x_forwarded_proto, postgres_db_name): def run(self): self.do() return_code = self.handle.wait() + self.cleanup() # Mainly closes the log file. if return_code != 0: fail(f"Command {self.name} failed. Logs in {self.log_dir}") - self.cleanup() if self.capture_stdout: return self.handle.communicate()[0].decode("utf-8").rstrip() @@ -781,9 +780,8 @@ def prepare(x_forwarded_host, x_forwarded_proto, postgres_db_name): return self.log_file.name def cleanup(self): - if not self.log_file.closed: - self.log_file.flush() - self.log_file.close() + self.log_file.flush() + self.log_file.close() def do(self): if not self.log_dir.is_dir(): |