Browse Source

Merge pull request #3 from gerardroche/fixes

Fixes
Marco Pivetta 11 years ago
parent
commit
aa097b9472
2 changed files with 2 additions and 1 deletions
  1. 1 0
      php-zend-framework/deploy/nginx.conf
  2. 1 1
      php-zend-framework/setup.py

+ 1 - 0
php-zend-framework/deploy/nginx.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
 #error_log  logs/error.log  info;
+error_log stderr error;
 
 
 #pid        logs/nginx.pid;
 #pid        logs/nginx.pid;
 
 

+ 1 - 1
php-zend-framework/setup.py

@@ -6,7 +6,7 @@ from os.path import expanduser
 home = expanduser("~")
 home = expanduser("~")
 
 
 def start(args, logfile, errfile):
 def start(args, logfile, errfile):
-  setup_util.replace_text("php-zend-framework/config/benchmarks.local.php", "mysql:dbname=hello_world;host=localhost", "mysql:dbname=hello_world;host=" + args.database_host)
+  setup_util.replace_text("php-zend-framework/config/benchmarks.local.php", "host=localhost", "host=" + args.database_host)
   setup_util.replace_text("php-zend-framework/deploy/nginx.conf", "root .*\/FrameworkBenchmarks", "root " + home + "/FrameworkBenchmarks")
   setup_util.replace_text("php-zend-framework/deploy/nginx.conf", "root .*\/FrameworkBenchmarks", "root " + home + "/FrameworkBenchmarks")
 
 
   try:
   try: