From f99ea74e3f58299d5e01224d11d69422c2b10b7f Mon Sep 17 00:00:00 2001 From: simon987 Date: Wed, 3 Apr 2024 11:18:54 -0400 Subject: [PATCH] Passthrough frontend logs to stdout --- sist2-admin/sist2_admin/jobs.py | 2 +- sist2-admin/sist2_admin/sist2.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sist2-admin/sist2_admin/jobs.py b/sist2-admin/sist2_admin/jobs.py index 7016b1a..14adb84 100644 --- a/sist2-admin/sist2_admin/jobs.py +++ b/sist2-admin/sist2_admin/jobs.py @@ -204,7 +204,7 @@ class Sist2IndexTask(Sist2Task): self.job.previous_index_path = self.job.index_path db["jobs"][self.job.name] = self.job - self._logger.info(json.dumps({"sist2-admin": f"Sist2Scan task finished {return_code=}, {duration=}"})) + self._logger.info(json.dumps({"sist2-admin": f"Sist2Scan task finished {return_code=}, {duration=}, {ok=}"})) logger.info(f"Completed {self.display_name} ({return_code=})") diff --git a/sist2-admin/sist2_admin/sist2.py b/sist2-admin/sist2_admin/sist2.py index 099edd6..8fb255c 100644 --- a/sist2-admin/sist2_admin/sist2.py +++ b/sist2-admin/sist2_admin/sist2.py @@ -2,10 +2,11 @@ import datetime import json import logging import os.path +import sys from datetime import datetime from enum import Enum from io import TextIOWrapper -from logging import FileHandler +from logging import FileHandler, StreamHandler from subprocess import Popen, PIPE from tempfile import NamedTemporaryFile from threading import Thread @@ -338,6 +339,7 @@ class Sist2: web_logger = logging.Logger(name=f"sist2-frontend-{name}") web_logger.addHandler(FileHandler(os.path.join(LOG_FOLDER, f"frontend-{name}.log"))) + web_logger.addHandler(StreamHandler()) def logs_cb(message): web_logger.info(json.dumps(message))