Skip to content
Snippets Groups Projects
Commit 0e40eb3c authored by Dariusz Kędzierski's avatar Dariusz Kędzierski
Browse files

Rebase to current autoclave

parents 75f61aaf 713a7360
No related branches found
No related tags found
3 merge requests!9finally merge old fixes with master,!7merge changes from hbt4,!4Attach traceback in jussi interal error
...@@ -117,7 +117,6 @@ class JussiInteralError(Exception): ...@@ -117,7 +117,6 @@ class JussiInteralError(Exception):
jrpc_request: JrpcRequest=None, jrpc_request: JrpcRequest=None,
jrpc_response: JrpcResponse=None, jrpc_response: JrpcResponse=None,
exception: Exception = None, exception: Exception = None,
log_traceback: bool = False,
error_logger: logging.Logger = None, error_logger: logging.Logger = None,
**kwargs) -> None: **kwargs) -> None:
...@@ -128,7 +127,7 @@ class JussiInteralError(Exception): ...@@ -128,7 +127,7 @@ class JussiInteralError(Exception):
self.jsonrpc_request = jrpc_request self.jsonrpc_request = jrpc_request
self.jsonrpc_response = jrpc_response self.jsonrpc_response = jrpc_response
self.exception = exception self.exception = exception
self.log_traceback = log_traceback self.log_traceback = http_request.app.config.args.log_traceback
self.logger = error_logger or logger self.logger = error_logger or logger
self.kwargs = kwargs self.kwargs = kwargs
......
...@@ -129,6 +129,11 @@ def parse_args(args: list = None): ...@@ -129,6 +129,11 @@ def parse_args(args: list = None):
parser.add_argument('--statsd_url', type=str, env_var='JUSSI_STATSD_URL', parser.add_argument('--statsd_url', type=str, env_var='JUSSI_STATSD_URL',
help='statsd://host:port', help='statsd://host:port',
default=None) default=None)
parser.add_argument('--log_traceback', type=lambda x: bool(strtobool(x)),
env_var='JUSSI_LOG_TRACEBACK',
help='Add traceback information to error message',
default=False)
return parser.parse_args(args=args) return parser.parse_args(args=args)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment