Browse Source

218 make Kain's changes from the PR comments

mcocciaTE 11 years ago
parent
commit
9816ac9e81

+ 2 - 2
php-zend-framework/benchmark_config

@@ -10,14 +10,14 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "ZendFramework",
+      "framework": "Zend",
       "language": "PHP",
       "orm": "Full",
       "platform": "PHP-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "ZendFramework",
+      "display_name": "zend",
       "notes": "",
       "versus": "php"
     }

+ 1 - 1
php-zend-framework/config/autoload/benchmarks.local.php

@@ -3,6 +3,6 @@
 return array(
     'db' => array(
         'driver' => 'Pdo',
-        'dsn'    => 'mysql:dbname=hello_world;host=localhost',
+        'dsn'    => 'mysql:dbname=hello_world;host=127.0.0.1',
     ),
 );

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

@@ -66,7 +66,7 @@ http {
         #    proxy_pass   http://127.0.0.1;
         #}
 
-        root /home/ubuntu/FrameworkBenchmarks/php-zend-framework/public/;
+        root /home/tfb/FrameworkBenchmarks/php-zend-framework/public/;
         index  index.php;
 
         location / {

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

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