mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
[enh] Return log after app upgrade with api
This commit is contained in:
parent
32d3a9940b
commit
171258e7fa
1 changed files with 8 additions and 1 deletions
|
@ -38,7 +38,7 @@ import pwd
|
||||||
import grp
|
import grp
|
||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
|
|
||||||
from moulinette import msignals, m18n
|
from moulinette import msignals, m18n, msettings
|
||||||
from moulinette.core import MoulinetteError
|
from moulinette.core import MoulinetteError
|
||||||
from moulinette.utils.log import getActionLogger
|
from moulinette.utils.log import getActionLogger
|
||||||
|
|
||||||
|
@ -531,6 +531,9 @@ def app_upgrade(auth, app=[], url=None, file=None):
|
||||||
"""
|
"""
|
||||||
from yunohost.hook import hook_add, hook_remove, hook_exec
|
from yunohost.hook import hook_add, hook_remove, hook_exec
|
||||||
|
|
||||||
|
# Retrieve interface
|
||||||
|
is_api = msettings.get('interface') == 'api'
|
||||||
|
|
||||||
try:
|
try:
|
||||||
app_list()
|
app_list()
|
||||||
except MoulinetteError:
|
except MoulinetteError:
|
||||||
|
@ -632,6 +635,10 @@ def app_upgrade(auth, app=[], url=None, file=None):
|
||||||
|
|
||||||
logger.success(m18n.n('upgrade_complete'))
|
logger.success(m18n.n('upgrade_complete'))
|
||||||
|
|
||||||
|
# Return API logs if it is an API call
|
||||||
|
if is_api:
|
||||||
|
return {"log": service_log('yunohost-api', number="100").values()[0]}
|
||||||
|
|
||||||
|
|
||||||
def app_install(auth, app, label=None, args=None, no_remove_on_failure=False):
|
def app_install(auth, app, label=None, args=None, no_remove_on_failure=False):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Add table
Reference in a new issue