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

Support yunohost-api.log

Browse source
This commit is contained in:
Maniack Crudelis 2019-03-17 23:30:57 +01:00 • committed by GitHub
parent c21a455909
commit f71117b401
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
data/helpers.d/system
View file

@ -1,5 +1,14 @@
#!/bin/bash #!/bin/bash
# Determine whether the scripts is executed from a terminal or the admin JS.
#
# [internal]
ynh_is_term () {
# Return true if $TERM return xterm-XXXcolor
# Which means the script is executed from a terminal, not from the admin JS
[[ "$TERM" =~ "xterm" ]]
}
# Manage a fail of the script # Manage a fail of the script
# #
# [internal] # [internal]
@ -29,7 +38,13 @@ ynh_exit_properly () {
# Unset xtrace to not spoil the log # Unset xtrace to not spoil the log
set +x set +x
local ynh_log="/var/log/yunohost/yunohost-cli.log"
if ynh_is_term
then
local ynh_log="/var/log/yunohost/yunohost-cli.log"
else
local ynh_log="/var/log/yunohost/yunohost-api.log"
fi
# Wait for the log to be fill with the data until the crash. # Wait for the log to be fill with the data until the crash.
local timeout=0 local timeout=0
while ! tail --lines=20 "$ynh_log" | grep --quiet "ynh_exit_properly" while ! tail --lines=20 "$ynh_log" | grep --quiet "ynh_exit_properly"