Browse Source

Fixed debug issue during HHVM is enabled

bugfixes
gau1991 10 years ago
parent
commit
1b57be9a64
  1. 6
      ee/cli/plugins/debug.py
  2. 2
      ee/cli/plugins/stack.py
  3. 4
      ee/cli/templates/upstream.mustache

6
ee/cli/plugins/debug.py

@ -163,8 +163,8 @@ class EEDebugController(CementBaseController):
"conf.d/upstream.conf " "conf.d/upstream.conf "
"| grep 9001")): "| grep 9001")):
Log.info(self, "Enabling PHP debug") Log.info(self, "Enabling PHP debug")
data = dict(php="9001", debug="9001") data = dict(php="9001", debug="9001", hhvm="9001")
Log.info(self, 'Writting the Nginx debug configration to file ' Log.debug(self, 'Writting the Nginx debug configration to file'
' /etc/nginx/conf.d/upstream.conf ') ' /etc/nginx/conf.d/upstream.conf ')
ee_nginx = open('/etc/nginx/conf.d/upstream.conf', ee_nginx = open('/etc/nginx/conf.d/upstream.conf',
encoding='utf-8', mode='w') encoding='utf-8', mode='w')
@ -183,7 +183,7 @@ class EEDebugController(CementBaseController):
"/etc/nginx/conf.d/upstream.conf " "/etc/nginx/conf.d/upstream.conf "
"| grep 9001"): "| grep 9001"):
Log.info(self, "Disabling PHP debug") Log.info(self, "Disabling PHP debug")
data = dict(php="9000", debug="9001") data = dict(php="9000", debug="9001", hhvm="8000")
Log.debug(self, 'Writting the Nginx debug configration to file' Log.debug(self, 'Writting the Nginx debug configration to file'
' /etc/nginx/conf.d/upstream.conf ') ' /etc/nginx/conf.d/upstream.conf ')
ee_nginx = open('/etc/nginx/conf.d/upstream.conf', ee_nginx = open('/etc/nginx/conf.d/upstream.conf',

2
ee/cli/plugins/stack.py

@ -227,7 +227,7 @@ class EEStackController(CementBaseController):
self.app.render((data), 'fastcgi.mustache', out=ee_nginx) self.app.render((data), 'fastcgi.mustache', out=ee_nginx)
ee_nginx.close() ee_nginx.close()
data = dict(php="9000", debug="9001") data = dict(php="9000", debug="9001", hhvm="8000")
Log.debug(self, 'Writting the nginx configuration to ' Log.debug(self, 'Writting the nginx configuration to '
'file /etc/nginx/conf.d/upstream.conf ') 'file /etc/nginx/conf.d/upstream.conf ')
ee_nginx = open('/etc/nginx/conf.d/upstream.conf', ee_nginx = open('/etc/nginx/conf.d/upstream.conf',

4
ee/cli/templates/upstream.mustache

@ -9,6 +9,6 @@ server 127.0.0.1:{{debug}};
} }
upstream hhvm { upstream hhvm {
# HHVM Pool # HHVM Pool
server 127.0.0.1:8000; server 127.0.0.1:{{hhvm}};
server 127.0.0.1:9000 backup; server 127.0.0.1:{{php}} backup;
} }

Loading…
Cancel
Save