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

fix wo clean

Browse Source
This commit is contained in:
VirtuBox
2019-12-04 16:20:27 +01:00
parent 732ff51d9f
commit 9a04a0d786
3 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wo/cli/plugins/clean.py
View File

@@ -74,19 +74,18 @@ class WOCleanController(CementBaseController):
def clean_opcache(self):
if (os.path.exists('/usr/sbin/nginx') and
os.path.exists(
'/var/www/22222/htdocs/cache/opcache/opgui.php')):
'/var/www/22222/htdocs/cache/opcache/php72.php')):
try:
Log.info(self, "Cleaning opcache")
payload = {'RESET': '1'}
opgui = requests.get(
"http://127.0.0.1/cache/opcache/ocp.php", params=payload)
"http://127.0.0.1/cache/opcache/php72.php")
if opgui.status_code != '200' or opgui.status_code != '302':
Log.warn(self, 'Cleaning opcache failed')
except Exception as e:
Log.debug(self, "{0}".format(e))
Log.debug(self, "Unable hit url, "
" http://127.0.0.1/cache/opcache/"
"opgui.php?reset=1,"
"php72.php,"
" please check you have admin tools installed")
Log.debug(self, "please check you have admin tools installed,"
" or install them with `wo stack install --admin`")

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

@@ -606,6 +606,16 @@ def post_pref(self, apt_packages, packages, upgrade=False):
encoding='utf-8', mode='w') as myfile:
myfile.write("<?php\nphpinfo();\n?>")
# write opcache clean for php72
if not os.path.exists('{0}22222/htdocs/cache/opcache'
.format(ngxroot)):
os.makedirs('{0}22222/htdocs/cache/opcache'
.format(ngxroot))
WOFileUtils.textwrite(
self, '{0}22222/htdocs/cache/opcache/php72.php'
.format(ngxroot),
'<?php opcache_reset(); ?>')
WOFileUtils.chown(self, "{0}22222/htdocs"
.format(ngxroot),
'www-data',
@@ -743,6 +753,16 @@ def post_pref(self, apt_packages, packages, upgrade=False):
encoding='utf-8', mode='w') as myfile:
myfile.write("<?php\nphpinfo();\n?>")
# write opcache clean for php73
if not os.path.exists('{0}22222/htdocs/cache/opcache'
.format(ngxroot)):
os.makedirs('{0}22222/htdocs/cache/opcache'
.format(ngxroot))
WOFileUtils.textwrite(
self, '{0}22222/htdocs/cache/opcache/php73.php'
.format(ngxroot),
'<?php opcache_reset(); ?>')
WOFileUtils.chown(self, "{0}22222/htdocs"
.format(ngxroot),
'www-data',
@@ -879,6 +899,16 @@ def post_pref(self, apt_packages, packages, upgrade=False):
self, "{0}22222/htdocs/php/info.php"
.format(ngxroot), "<?php\nphpinfo();\n?>")
# write opcache clean for php74
if not os.path.exists('{0}22222/htdocs/cache/opcache'
.format(ngxroot)):
os.makedirs('{0}22222/htdocs/cache/opcache'
.format(ngxroot))
WOFileUtils.textwrite(
self, '{0}22222/htdocs/cache/opcache/php74.php'
.format(ngxroot),
'<?php opcache_reset(); ?>')
WOFileUtils.chown(self, "{0}22222/htdocs"
.format(ngxroot),
'www-data',

20
wo/cli/templates/stub_status.mustache
View File

@@ -28,12 +28,26 @@ server {
log_not_found off;
}
location / {
try_files $uri $uri/ /cache/opcache/opgui.php$is_args$args;
try_files $uri $uri/ /index.php$is_args$args;
}
location ~ \.php$ {
location /cache/opcache/php72.php {
try_files $uri =404;
include fastcgi_params;
fastcgi_pass phpstatus;
fastcgi_pass php72;
access_log off;
log_not_found off;
}
location /cache/opcache/php73.php {
try_files $uri =404;
include fastcgi_params;
fastcgi_pass php73;
access_log off;
log_not_found off;
}
location /cache/opcache/php74.php {
try_files $uri =404;
include fastcgi_params;
fastcgi_pass php74;
access_log off;
log_not_found off;
}