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

Merge pull request #413 from YunoHost/nginx-t_in_diagnosis

Browse source 
[enh] add nginx -t output to diagnosis
This commit is contained in:
Laurent Peuch 2018-01-11 14:13:31 +01:00 • committed by GitHub
commit f78d9009d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/yunohost/tools.py
View file

@ -42,6 +42,7 @@ import apt.progress
from moulinette import msettings, msignals, m18n from moulinette import msettings, msignals, m18n
from moulinette.core import MoulinetteError, init_authenticator from moulinette.core import MoulinetteError, init_authenticator
from moulinette.utils.log import getActionLogger from moulinette.utils.log import getActionLogger
from moulinette.utils.process import check_output
from moulinette.utils.filesystem import read_json, write_to_json from moulinette.utils.filesystem import read_json, write_to_json
from yunohost.app import app_fetchlist, app_info, app_upgrade, app_ssowatconf, app_list, _install_appslist_fetch_cron from yunohost.app import app_fetchlist, app_info, app_upgrade, app_ssowatconf, app_list, _install_appslist_fetch_cron
from yunohost.domain import domain_add, domain_list, get_public_ip, _get_maindomain, _set_maindomain from yunohost.domain import domain_add, domain_list, get_public_ip, _get_maindomain, _set_maindomain
@ -589,6 +590,9 @@ def tools_diagnosis(auth, private=False):
'swap': '%s (%s free)' % (system['memory']['swap']['total'], system['memory']['swap']['free']), 'swap': '%s (%s free)' % (system['memory']['swap']['total'], system['memory']['swap']['free']),
} }
# nginx -t
diagnosis['nginx'] = check_output("nginx -t").strip().split("\n")
# Services status # Services status
services = service_status() services = service_status()
diagnosis['services'] = {} diagnosis['services'] = {}