diff --git a/ext/dapr-ext-workflow/dapr/ext/workflow/dapr_workflow_client.py b/ext/dapr-ext-workflow/dapr/ext/workflow/dapr_workflow_client.py index d025a1ef..c1165b42 100644 --- a/ext/dapr-ext-workflow/dapr/ext/workflow/dapr_workflow_client.py +++ b/ext/dapr-ext-workflow/dapr/ext/workflow/dapr_workflow_client.py @@ -61,11 +61,12 @@ def __init__( metadata = tuple() if settings.DAPR_API_TOKEN: metadata = ((DAPR_API_TOKEN_HEADER, settings.DAPR_API_TOKEN),) + options = self._logger.get_options() self.__obj = client.TaskHubGrpcClient(host_address=uri.endpoint, metadata=metadata, secure_channel=uri.tls, - log_handler=self._logger.get_options().log_handler, - log_formatter=self._logger.get_options().log_formatter) + log_handler=options.log_handler, + log_formatter=options.log_formatter) def schedule_new_workflow(self, workflow: Workflow, *, input: Optional[TInput] = None, instance_id: Optional[str] = None, diff --git a/ext/dapr-ext-workflow/dapr/ext/workflow/logger/logger.py b/ext/dapr-ext-workflow/dapr/ext/workflow/logger/logger.py index 4ba98478..ef320bda 100644 --- a/ext/dapr-ext-workflow/dapr/ext/workflow/logger/logger.py +++ b/ext/dapr-ext-workflow/dapr/ext/workflow/logger/logger.py @@ -2,9 +2,10 @@ from typing import Union from dapr.ext.workflow.logger.options import LoggerOptions + class Logger: - def __init__(self, - name: str, + def __init__(self, + name: str, options: Union[LoggerOptions, None] = None): # If options is None, then create a new LoggerOptions object if options is None: @@ -16,7 +17,7 @@ def __init__(self, logger.handlers.append(log_handler) self._logger_options = options self._logger = logger - + def get_options(self) -> LoggerOptions: return self._logger_options diff --git a/ext/dapr-ext-workflow/dapr/ext/workflow/logger/options.py b/ext/dapr-ext-workflow/dapr/ext/workflow/logger/options.py index 37f2f5f6..46b499c1 100644 --- a/ext/dapr-ext-workflow/dapr/ext/workflow/logger/options.py +++ b/ext/dapr-ext-workflow/dapr/ext/workflow/logger/options.py @@ -37,4 +37,4 @@ def __init__( datefmt='%Y-%m-%d %H:%M:%S') self.log_level = log_level self.log_handler = log_handler - self.log_formatter = log_formatter \ No newline at end of file + self.log_formatter = log_formatter diff --git a/ext/dapr-ext-workflow/dapr/ext/workflow/workflow_runtime.py b/ext/dapr-ext-workflow/dapr/ext/workflow/workflow_runtime.py index 4d3227a5..241179cd 100644 --- a/ext/dapr-ext-workflow/dapr/ext/workflow/workflow_runtime.py +++ b/ext/dapr-ext-workflow/dapr/ext/workflow/workflow_runtime.py @@ -53,11 +53,12 @@ def __init__( except ValueError as error: raise DaprInternalError(f'{error}') from error + options = self._logger.get_options() self.__worker = worker.TaskHubGrpcWorker(host_address=uri.endpoint, metadata=metadata, secure_channel=uri.tls, - log_handler=self._logger.get_options().log_handler, - log_formatter=self._logger.get_options().log_formatter) + log_handler=options.log_handler, + log_formatter=options.log_formatter) def register_workflow(self, fn: Workflow): self._logger.info(f"Registering workflow '{fn.__name__}' with runtime")