diff --git a/model_server/base/session.py b/model_server/base/session.py index a72dfa5a9568d1fb7f4b1d0eac313f3c77a2bf72..6119690b0bd5735437741f13da18f4e2556c076f 100644 --- a/model_server/base/session.py +++ b/model_server/base/session.py @@ -10,6 +10,9 @@ import model_server.conf.defaults from model_server.base.models import Model from model_server.base.workflows import WorkflowRunRecord +logger = logging.getLogger(__name__) + + def create_manifest_json(): pass @@ -26,6 +29,8 @@ class Session(object, metaclass=Singleton): Singleton class for a server session that persists data between API calls """ + log_format = '%(asctime)s - %(levelname)s - %(message)s' + def __init__(self, root: str = None): print('Initializing session') self.models = {} # model_id : model object @@ -33,8 +38,7 @@ class Session(object, metaclass=Singleton): self.paths = self.make_paths(root) self.logfile = self.paths['logs'] / f'session.log' - logging.basicConfig(filename=self.logfile, level=logging.INFO, force=True) - self.logger = logging.getLogger(__name__) + logging.basicConfig(filename=self.logfile, level=logging.INFO, force=True, format=self.log_format) self.log_info('Initialized session') @@ -85,15 +89,13 @@ class Session(object, metaclass=Singleton): return f'{yyyymmdd}-{idx:04d}' def log_info(self, msg): - self.logger.info(msg) - - # def log_event(self, event: str): - # """ - # Write an event string to this session's log file. - # """ - # timestamp = strftime('%m/%d/%Y, %H:%M:%S', localtime()) - # with open(self.session_log, 'a') as fh: - # fh.write(f'{timestamp} -- {event}\n') + logger.info(msg) + + def log_warning(self, msg): + logger.warning(msg) + + def log_error(self, msg): + logger.error(msg) def record_workflow_run(self, record: WorkflowRunRecord or None): """