Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve log display

Browse Source
This commit is contained in:
VirtuBox
2023-08-26 15:27:02 +02:00
parent 36d70b4ff9
commit 9c66cd751a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wo/cli/plugins/stack_pref.py
View File

@@ -154,7 +154,7 @@ def post_pref(self, apt_packages, packages, upgrade=False):
if (apt_packages): if (apt_packages):
# Nginx configuration # Nginx configuration
if set(WOVar.wo_nginx).issubset(set(apt_packages)): if set(WOVar.wo_nginx).issubset(set(apt_packages)):
Log.info(self, "Applying Nginx configuration templates") Log.wait(self, "Configuring Nginx")
# Nginx main configuration # Nginx main configuration
ngxcnf = '/etc/nginx/conf.d' ngxcnf = '/etc/nginx/conf.d'
ngxcom = '/etc/nginx/common' ngxcom = '/etc/nginx/common'
@@ -458,6 +458,7 @@ def post_pref(self, apt_packages, packages, upgrade=False):
"Use the command nginx -t to identify " "Use the command nginx -t to identify "
"the cause of this issue", False) "the cause of this issue", False)
else: else:
Log.valide(self, "Configuring Nginx")
WOGit.add(self, ["/etc/nginx"], msg="Adding Nginx into Git") WOGit.add(self, ["/etc/nginx"], msg="Adding Nginx into Git")
if not os.path.isdir('/etc/systemd/system/nginx.service.d'): if not os.path.isdir('/etc/systemd/system/nginx.service.d'):
WOFileUtils.mkdir(self, WOFileUtils.mkdir(self,
@@ -480,7 +481,7 @@ def post_pref(self, apt_packages, packages, upgrade=False):
for php_version in php_list: for php_version in php_list:
WOGit.add(self, ["/etc/php"], msg="Adding PHP into Git") WOGit.add(self, ["/etc/php"], msg="Adding PHP into Git")
Log.info(self, "Configuring php{0}-fpm".format(php_version[0])) Log.wait(self, "Configuring php{0}-fpm".format(php_version[0]))
ngxroot = '/var/www/' ngxroot = '/var/www/'
# Create log directories # Create log directories
@@ -653,6 +654,7 @@ def post_pref(self, apt_packages, packages, upgrade=False):
.format(php_version[0])): .format(php_version[0])):
WOGit.rollback(self, ["/etc/php"], msg="Rollback PHP") WOGit.rollback(self, ["/etc/php"], msg="Rollback PHP")
else: else:
Log.valide(self, "Configuring php{0}-fpm".format(php_version[0]))
WOGit.add(self, ["/etc/php"], msg="Adding PHP into Git") WOGit.add(self, ["/etc/php"], msg="Adding PHP into Git")
if os.path.exists('/etc/nginx/conf.d/upstream.conf'): if os.path.exists('/etc/nginx/conf.d/upstream.conf'):