YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Unit operation log decorator fail on internal call

Browse source
This commit is contained in:
ljf 2018-06-04 22:54:51 +02:00
parent 91caae665e
commit 97010941ed
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/yunohost/log.py
View file

@ -213,11 +213,21 @@ def is_unit_operation(entities='app,domain,service,user', exclude='auth,password
if op_key is None: if op_key is None:
op_key = func.__name__ op_key = func.__name__
# In case the function is called directly from an other part of the
# code
if len(args) > 0:
from inspect import getargspec
keys = getargspec(func).args
for k, arg in enumerate(args):
kwargs[keys[k]] = arg
args = ()
# Search related entity in arguments of the decorated function # Search related entity in arguments of the decorated function
for entity in entities_list: for entity in entities_list:
entity = entity.split(':') entity = entity.split(':')
entity_type = entity[-1] entity_type = entity[-1]
entity = entity[0] entity = entity[0]
if entity in kwargs and kwargs[entity] is not None: if entity in kwargs and kwargs[entity] is not None:
if isinstance(kwargs[entity], basestring): if isinstance(kwargs[entity], basestring):
related_to.append((entity_type, kwargs[entity])) related_to.append((entity_type, kwargs[entity]))
@ -357,6 +367,8 @@ class UnitOperation(object):
""" """
if self.ended_at is not None or self.started_at is None: if self.ended_at is not None or self.started_at is None:
return return
if error is not None and not isinstance(error, basestring):
error = str(error)
self.ended_at = datetime.now() self.ended_at = datetime.now()
self._error = error self._error = error
self._success = error is None self._success = error is None