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

Fix wo log reset --all

Browse Source
This commit is contained in:
Hamada Habib
2022-05-23 17:09:02 +02:00
committed by GitHub
parent 464dce23e2
commit 7f2cfe11ad
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
wo/cli/plugins/log.py
View File

@@ -92,15 +92,15 @@ class WOLogShowController(CementBaseController):
self.msg = self.msg + ["/var/log/nginx/*access.log"] self.msg = self.msg + ["/var/log/nginx/*access.log"]
if self.app.pargs.fpm: if self.app.pargs.fpm:
open('/var/log/php/7.2/slow.log', 'a').close() #open('/var/log/php/7.2/slow.log', 'a').close()
open('/var/log/php7.2-fpm.log', 'a').close() #open('/var/log/php7.2-fpm.log', 'a').close()
self.msg = self.msg + ['/var/log/php/7.2/slow.log', self.msg = self.msg + ['/var/log/php/*/slow.log',
'/var/log/php7.2-fpm.log'] '/var/log/php*-fpm.log']
if self.app.pargs.mysql: if self.app.pargs.mysql:
# MySQL debug will not work for remote MySQL # MySQL debug will not work for remote MySQL
if WOVar.wo_mysql_host == "localhost": if WOVar.wo_mysql_host == "localhost":
if os.path.isfile('/var/log/mysql/mysql-slow.log'): if os.path.isfile('/var/log/mysql/mariadb-slow.log'):
self.msg = self.msg + ['/var/log/mysql/mysql-slow.log'] self.msg = self.msg + ['/var/log/mysql/*-slow.log']
else: else:
Log.info(self, "MySQL slow-log not found, skipped") Log.info(self, "MySQL slow-log not found, skipped")
else: else:
@@ -231,15 +231,15 @@ class WOLogResetController(CementBaseController):
self.msg = self.msg + ["/var/log/nginx/*access.log"] self.msg = self.msg + ["/var/log/nginx/*access.log"]
if self.app.pargs.fpm: if self.app.pargs.fpm:
open('/var/log/php/7.2/slow.log', 'a').close() #open('/var/log/php/7.2/slow.log', 'a').close()
open('/var/log/php7.2-fpm.log', 'a').close() #open('/var/log/php7.2-fpm.log', 'a').close()
self.msg = self.msg + ['/var/log/php/7.2/slow.log', self.msg = self.msg + ['/var/log/php/*/slow.log',
'/var/log/php7.2-fpm.log'] '/var/log/php*-fpm.log']
if self.app.pargs.mysql: if self.app.pargs.mysql:
# MySQL debug will not work for remote MySQL # MySQL debug will not work for remote MySQL
if WOVar.wo_mysql_host == "localhost": if WOVar.wo_mysql_host == "localhost":
if os.path.isfile('/var/log/mysql/mysql-slow.log'): if os.path.isfile('/var/log/mysql/mariadb-slow.log'):
self.msg = self.msg + ['/var/log/mysql/mysql-slow.log'] self.msg = self.msg + ['/var/log/mysql/*-slow.log']
else: else:
Log.info(self, "MySQL slow-log not found, skipped") Log.info(self, "MySQL slow-log not found, skipped")
else: else:
@@ -359,15 +359,15 @@ class WOLogGzipController(CementBaseController):
self.msg = self.msg + ["/var/log/nginx/*access.log"] self.msg = self.msg + ["/var/log/nginx/*access.log"]
if self.app.pargs.fpm: if self.app.pargs.fpm:
open('/var/log/php/7.2/slow.log', 'a').close() #open('/var/log/php/7.2/slow.log', 'a').close()
open('/var/log/php7.2-fpm.log', 'a').close() #open('/var/log/php7.2-fpm.log', 'a').close()
self.msg = self.msg + ['/var/log/php/7.2/slow.log', self.msg = self.msg + ['/var/log/php/*/slow.log',
'/var/log/php7.2-fpm.log'] '/var/log/php*-fpm.log']
if self.app.pargs.mysql: if self.app.pargs.mysql:
# MySQL debug will not work for remote MySQL # MySQL debug will not work for remote MySQL
if WOVar.wo_mysql_host == "localhost": if WOVar.wo_mysql_host == "localhost":
if os.path.isfile('/var/log/mysql/mysql-slow.log'): if os.path.isfile('/var/log/mysql/mariadb-slow.log'):
self.msg = self.msg + ['/var/log/mysql/mysql-slow.log'] self.msg = self.msg + ['/var/log/mysql/*-slow.log']
else: else:
Log.info(self, "MySQL slow-log not found, skipped") Log.info(self, "MySQL slow-log not found, skipped")
@@ -445,10 +445,10 @@ class WOLogMailController(CementBaseController):
(['--nginx'], (['--nginx'],
dict(help='Mail Nginx Error logs file', action='store_true')), dict(help='Mail Nginx Error logs file', action='store_true')),
(['--php'], (['--php'],
dict(help='Mail PHP 7.2 Error logs file', dict(help='Mail PHP Error logs file',
action='store_true')), action='store_true')),
(['--fpm'], (['--fpm'],
dict(help='Mail PHP 7.2-fpm slow logs file', dict(help='Mail PHP fpm slow logs file',
action='store_true')), action='store_true')),
(['--mysql'], (['--mysql'],
dict(help='Mail MySQL logs file', action='store_true')), dict(help='Mail MySQL logs file', action='store_true')),
@@ -497,15 +497,15 @@ class WOLogMailController(CementBaseController):
self.msg = self.msg + ["/var/log/nginx/*access.log"] self.msg = self.msg + ["/var/log/nginx/*access.log"]
if self.app.pargs.fpm: if self.app.pargs.fpm:
open('/var/log/php/7.2/slow.log', 'a').close() #open('/var/log/php/7.2/slow.log', 'a').close()
open('/var/log/php7.2-fpm.log', 'a').close() #open('/var/log/php7.2-fpm.log', 'a').close()
self.msg = self.msg + ['/var/log/php/7.2/slow.log', self.msg = self.msg + ['/var/log/php/*/slow.log',
'/var/log/php7.2-fpm.log'] '/var/log/php*-fpm.log']
if self.app.pargs.mysql: if self.app.pargs.mysql:
# MySQL debug will not work for remote MySQL # MySQL debug will not work for remote MySQL
if WOVar.wo_mysql_host == "localhost": if WOVar.wo_mysql_host == "localhost":
if os.path.isfile('/var/log/mysql/mysql-slow.log'): if os.path.isfile('/var/log/mysql/mariadb-slow.log'):
self.msg = self.msg + ['/var/log/mysql/mysql-slow.log'] self.msg = self.msg + ['/var/log/mysql/*-slow.log']
else: else:
Log.info(self, "MySQL slow-log not found, skipped") Log.info(self, "MySQL slow-log not found, skipped")
else: else: