Misc. Clean Up (#2773)

* Misc. Clean Up

* more the things

* merge conflicts

* fix codeigniter

* comment out redis stuff in api_hour

* comment out redis stuff in api_hour

frameworks/CSharp/aspnet/setup_nginx.sh

@@ -2,8 +2,6 @@
 
 fw_depends nginx mono
 
-sed -i 's|localhost|'"$DBHOST"'|g' src/Web.config
-
 # extra cleaning
 rm -rf src/bin src/obj
 rm -rf /tmp/nuget

frameworks/CSharp/aspnet/src/Web.config

@@ -6,10 +6,10 @@
   <!-- Connection Strings -->
   <!-- Names are case insensitive -->
   <connectionStrings>
-    <add name="MySQL" connectionString="server=localhost; user id=benchmarkdbuser; password=benchmarkdbpass; database=hello_world" providerName="MySql.Data.MySqlClient"/>
-    <add name="PostgreSQL" connectionString="server=localhost; user id=benchmarkdbuser; password=benchmarkdbpass; database=hello_world" providerName="Npgsql"/>
-    <add name="MongoDB" connectionString="mongodb://localhost"/>
-    <add name="SQLServer" connectionString="server=localhost; user id=benchmarkdbuser; password=B3nchmarkDBPass; database=hello_world" providerName="System.Data.SqlClient"/>
+    <add name="MySQL" connectionString="server=TFB-database; user id=benchmarkdbuser; password=benchmarkdbpass; database=hello_world" providerName="MySql.Data.MySqlClient"/>
+    <add name="PostgreSQL" connectionString="server=TFB-database; user id=benchmarkdbuser; password=benchmarkdbpass; database=hello_world" providerName="Npgsql"/>
+    <add name="MongoDB" connectionString="mongodb://TFB-database"/>
+    <add name="SQLServer" connectionString="server=TFB-database; user id=benchmarkdbuser; password=B3nchmarkDBPass; database=hello_world" providerName="System.Data.SqlClient"/>
   </connectionStrings>
   <!-- ADO.NET -->
   <system.data>

frameworks/D/collie/.gitignore

@@ -2,3 +2,4 @@
  .dub
  /collieHttp
  dub.selections.json
+http

frameworks/D/collie/benchmark_config.json

@@ -1,5 +1,5 @@
 {
-  "framework": "Collie",
+  "framework": "collie",
   "tests": [{
     "default": {
       "setup_file": "setup",

frameworks/Dart/dart-raw/postgresql.yaml

@@ -1,4 +1,4 @@
-host: localhost
+host: TFB-database
 port: 5432
 user: benchmarkdbuser
 password: benchmarkdbpass

frameworks/Dart/dart-raw/setup.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-sed -i 's|host: .*|host: '"${DBHOST}"'|g' postgresql.yaml
-
 fw_depends postgresql dart
 
 pub upgrade

frameworks/Dart/redstone/mongodb.yaml

@@ -1,2 +1,2 @@
-host: localhost
+host: TFB-database
 database: hello_world

frameworks/Dart/redstone/postgresql.yaml

@@ -1,4 +1,4 @@
-host: localhost
+host: TFB-database
 port: 5432
 user: benchmarkdbuser
 password: benchmarkdbpass

frameworks/Dart/redstone/setup.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-sed -i 's|host: .*|host: '"${DBHOST}"'|g' postgresql.yaml
-sed -i 's|host: .*|host: '"${DBHOST}"'|g' mongodb.yaml
-
 fw_depends dart
 
 pub upgrade

frameworks/Dart/start/mongodb.yaml

@@ -1,2 +1,2 @@
-host: localhost
+host: TFB-database
 database: hello_world

frameworks/Dart/start/postgresql.yaml

@@ -1,4 +1,4 @@
-host: tfbdata
+host: TFB-database
 port: 5432
 user: benchmarkdbuser
 password: benchmarkdbpass

frameworks/Dart/start/setup.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-sed -i 's|host: .*|host: '"${DBHOST}"'|g' postgresql.yaml
-sed -i 's|host: .*|host: '"${DBHOST}"'|g' mongodb.yaml
-
 fw_depends dart nginx
 
 pub upgrade

frameworks/Dart/stream/mongodb.yaml

@@ -1,2 +1,2 @@
-host: 127.0.0.1
+host: TFB-database
 database: hello_world

frameworks/Dart/stream/postgresql.yaml

@@ -1,4 +1,4 @@
-host: tfbdata
+host: TFB-database
 port: 5432
 user: benchmarkdbuser
 password: benchmarkdbpass

frameworks/Dart/stream/setup.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-sed -i 's|host: .*|host: '"${DBHOST}"'|g' postgresql.yaml
-sed -i 's|host: .*|host: '"${DBHOST}"'|g' mongodb.yaml
-
 fw_depends dart nginx
 
 pub upgrade

frameworks/Erlang/chicagoboss/boss.config

@@ -95,7 +95,7 @@
 %% db_cache_enable - Whether to enable the cache in boss_db. Defaults 
 %%   to false. Requires cache_enable to be set to true.
 
-    {db_host, "localhost"},
+    {db_host, "TFB-database"},
     {db_port, 1978},
     {db_adapter, mock},
 %    {db_username, "boss"},

frameworks/Erlang/chicagoboss/setup.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-sed -i 's|"benchmarkdbpass", ".*", 3306|"benchmarkdbpass", "'"${DBHOST}"'", 3306|g' boss.config
-
 fw_depends erlang
 
 rm -rf deps/* ebin/*

frameworks/Erlang/cowboy/setup.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-sed -i 's|"benchmarkdbpass", ".*", 3306|"benchmarkdbpass", "'"${DBHOST}"'", 3306|g' src/hello_world_app.erl
-
 fw_depends mysql erlang
 
 rm -rf deps/* ebin/*

frameworks/Erlang/cowboy/src/hello_world_app.erl

@@ -20,7 +20,7 @@ start(_Type, _Args) ->
         crypto:start(),
         application:start(emysql),
         emysql:add_pool(test_pool, 256,
-          "benchmarkdbuser", "benchmarkdbpass", "localhost", 3306,
+          "benchmarkdbuser", "benchmarkdbpass", "TFB-database", 3306,
           "hello_world", utf8),
 	emysql:prepare(db_stmt, <<"SELECT * FROM World where id = ?">>),
 	Dispatch = cowboy_router:compile([

frameworks/Erlang/elli/setup.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-sed -i 's|"benchmarkdbpass", ".*", 3306|"benchmarkdbpass", "'"${DBHOST}"'", 3306|g' src/elli_bench_sup.erl
-
 fw_depends erlang mysql
 
 rm -rf deps/* ebin/*

frameworks/Erlang/elli/src/elli_bench_sup.erl

@@ -30,7 +30,7 @@ init([]) ->
     crypto:start(),
     application:start(emysql),
     emysql:add_pool(test_pool, 256,
-       "benchmarkdbuser", "benchmarkdbpass", "localhost", 3306,
+       "benchmarkdbuser", "benchmarkdbpass", "TFB-database", 3306,
        "hello_world", utf8),
     emysql:prepare(db_stmt, <<"SELECT * FROM World where id = ?">>),
     ElliOpts = [{callback, elli_bench_cb}, {port, 8080}],

frameworks/Java/activeweb/setup.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-sed -i 's|localhost|'"${DBHOST}"'|g' src/main/webapp/WEB-INF/resin-web.xml
-sed -i 's|localhost|'"${DBHOST}"'|g' src/main/java/app/config/DbConfig.java
-
 fw_depends mysql java resin maven
 
 mvn clean package

frameworks/Java/activeweb/src/main/java/app/config/DbConfig.java

@@ -43,8 +43,8 @@ public class DbConfig extends AbstractDBConfig {
         environment("development").jndi("java:comp/env/jdbc/hello_world");
 
         //need to set ACTIVE_ENV=local to run on dev box.
-        environment("local").jdbc("com.mysql.jdbc.Driver", "jdbc:mysql://localhost/hello_world?" + jdbcParams, "benchmarkdbuser", "benchmarkdbpass");
+        environment("local").jdbc("com.mysql.jdbc.Driver", "jdbc:mysql://TFB-database/hello_world?" + jdbcParams, "benchmarkdbuser", "benchmarkdbpass");
 
-        environment("development").testing().jdbc("com.mysql.jdbc.Driver", "jdbc:mysql://localhost/hello_world?" + jdbcParams, "benchmarkdbuser", "benchmarkdbpass");
+        environment("development").testing().jdbc("com.mysql.jdbc.Driver", "jdbc:mysql://TFB-database/hello_world?" + jdbcParams, "benchmarkdbuser", "benchmarkdbpass");
     }
 }

frameworks/Java/activeweb/src/main/webapp/WEB-INF/resin-web.xml

@@ -3,7 +3,7 @@
 <database jndi-name='jdbc/hello_world'>
   <driver>
     <type>com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource</type>
-    <url>jdbc:mysql://localhost:3306/hello_world?jdbcCompliantTruncation=false&amp;elideSetAutoCommits=true&amp;useLocalSessionState=true&amp;cachePrepStmts=true&amp;cacheCallableStmts=true&amp;alwaysSendSetIsolation=false&amp;prepStmtCacheSize=4096&amp;cacheServerConfiguration=true&amp;prepStmtCacheSqlLimit=2048&amp;zeroDateTimeBehavior=convertToNull&amp;traceProtocol=false&amp;useUnbufferedInput=false&amp;useReadAheadInput=false&amp;maintainTimeStats=false&amp;useServerPrepStmts&amp;cacheRSMetadata=true</url>
+    <url>jdbc:mysql://TFB-database:3306/hello_world?jdbcCompliantTruncation=false&amp;elideSetAutoCommits=true&amp;useLocalSessionState=true&amp;cachePrepStmts=true&amp;cacheCallableStmts=true&amp;alwaysSendSetIsolation=false&amp;prepStmtCacheSize=4096&amp;cacheServerConfiguration=true&amp;prepStmtCacheSqlLimit=2048&amp;zeroDateTimeBehavior=convertToNull&amp;traceProtocol=false&amp;useUnbufferedInput=false&amp;useReadAheadInput=false&amp;maintainTimeStats=false&amp;useServerPrepStmts&amp;cacheRSMetadata=true</url>
     <user>benchmarkdbuser</user>
     <password>benchmarkdbpass</password>
     <useUnicode/>

frameworks/Java/dropwizard/hello-world-mongo.yml

@@ -19,6 +19,6 @@ logging:
   appenders: []
 
 mongo:
-  host: 127.0.0.1
+  host: TFB-database
   port: 27017
   db: hello_world

frameworks/Java/dropwizard/hello-world-mysql.yml

@@ -29,7 +29,7 @@ database:
   password: benchmarkdbpass
 
   # the JDBC URL
-  url: jdbc:mysql://127.0.0.1:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true
+  url: jdbc:mysql://TFB-database:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true
 
   # any properties specific to your JDBC driver:
   properties:

frameworks/Java/dropwizard/hello-world-postgres.yml

@@ -29,7 +29,7 @@ database:
   password: benchmarkdbpass
 
   # the JDBC URL
-  url: jdbc:postgresql://127.0.0.1:5432/hello_world
+  url: jdbc:postgresql://TFB-database:5432/hello_world
 
   # any properties specific to your JDBC driver:
   properties:

frameworks/Java/dropwizard/setup_mongo.sh

@@ -2,8 +2,6 @@
 
 fw_depends mongodb java maven
 
-sed -i 's|host: 127.0.0.1|host: '"${DBHOST}"'|g' hello-world-mongo.yml
-
 mvn -P mongo clean package
 
 java -jar target/hello-world-0.0.1-SNAPSHOT.jar server hello-world-mongo.yml &

frameworks/Java/dropwizard/setup_mysql.sh

@@ -2,8 +2,6 @@
 
 fw_depends mysql java maven
 
-sed -i 's|url: jdbc:mysql://.*/hello_world|url: jdbc:mysql://'"${DBHOST}"':3306/hello_world|g' hello-world-mysql.yml
-
 mvn -P mysql clean package
 
 java -jar target/hello-world-0.0.1-SNAPSHOT.jar server hello-world-mysql.yml &

frameworks/Java/dropwizard/setup_postgresql.sh

@@ -2,8 +2,6 @@
 
 fw_depends postgresql java maven
 
-sed -i 's|url: jdbc:postgresql://.*/hello_world|url: jdbc:postgresql://'"${DBHOST}"':5432/hello_world|g' hello-world-postgres.yml
-
 mvn -P postgres clean package
 
 java -jar target/hello-world-0.0.1-SNAPSHOT.jar server hello-world-postgres.yml &

frameworks/Java/play2-java/play2-java-ebean-hikaricp/conf/application.conf

@@ -31,7 +31,7 @@ application.langs="en"
 # db.default.jndiName=DefaultDS
 
 db.default.driver= com.mysql.jdbc.Driver
-db.default.url="jdbc:mysql://127.0.0.1:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true"
+db.default.url="jdbc:mysql://TFB-database:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true"
 db.default.username=benchmarkdbuser
 db.default.password=benchmarkdbpass
 db.default.jndiName=DefaultDS

frameworks/Java/play2-java/play2-java-jpa-bonecp/conf/application.conf

@@ -30,7 +30,7 @@ application.langs="en"
 # You can expose this datasource via JNDI if needed (Useful for JPA)
 # db.default.jndiName=DefaultDS
 db.default.driver= com.mysql.jdbc.Driver
-db.default.url="jdbc:mysql://127.0.0.1:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true"
+db.default.url="jdbc:mysql://TFB-database:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true"
 db.default.user=benchmarkdbuser
 db.default.password=benchmarkdbpass
 db.default.jndiName=DefaultDS

frameworks/Java/play2-java/play2-java-jpa-hikaricp/conf/application.conf

@@ -45,7 +45,7 @@ application.langs="en"
 # db.default.jndiName=DefaultDS
 
 db.default.driver= com.mysql.jdbc.Driver
-db.default.url="jdbc:mysql://127.0.0.1:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true"
+db.default.url="jdbc:mysql://TFB-database:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true"
 db.default.username=benchmarkdbuser
 db.default.password=benchmarkdbpass
 db.default.jndiName=DefaultDS

frameworks/Java/play2-java/setup_java_ebean_bonecp.sh

@@ -2,8 +2,6 @@
 
 fw_depends java sbt
 
-sed -i 's|127.0.0.1:3306|'${DBHOST}':3306|g' play2-java-ebean-bonecp/conf/application.conf
-
 cd play2-java-ebean-bonecp
 
 rm -rf target/universal/stage/RUNNING_PID

frameworks/Java/play2-java/setup_java_ebean_hikaricp.sh

@@ -2,8 +2,6 @@
 
 fw_depends mysql java sbt
 
-sed -i 's|127.0.0.1|'${DBHOST}'|g' play2-java-ebean-hikaricp/conf/application.conf
-
 cd play2-java-ebean-hikaricp
 
 rm -rf target/universal/stage/RUNNING_PID

frameworks/Java/play2-java/setup_java_jpa_bonecp.sh

@@ -2,8 +2,6 @@
 
 fw_depends java sbt
 
-sed -i 's|127.0.0.1|'${DBHOST}'|g' play2-java-jpa-bonecp/conf/application.conf
-
 cd play2-java-jpa-bonecp
 
 rm -rf target/universal/stage/RUNNING_PID

frameworks/Java/play2-java/setup_java_jpa_hikaricp.sh

@@ -2,8 +2,6 @@
 
 fw_depends mysql java sbt
 
-sed -i 's|127.0.0.1|'${DBHOST}'|g' play2-java-jpa-hikaricp/conf/application.conf
-
 cd play2-java-jpa-hikaricp
 
 rm -rf target/universal/stage/RUNNING_PID

frameworks/Java/tapestry/hello/src/main/webapp/WEB-INF/resin-web.xml

@@ -3,7 +3,7 @@
 <database jndi-name='jdbc/hello_world'>
   <driver>
     <type>com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource</type>
-    <url>jdbc:mysql://localhost:3306/hello_world?jdbcCompliantTruncation=false&amp;elideSetAutoCommits=true&amp;useLocalSessionState=true&amp;cachePrepStmts=true&amp;cacheCallableStmts=true&amp;alwaysSendSetIsolation=false&amp;prepStmtCacheSize=4096&amp;cacheServerConfiguration=true&amp;prepStmtCacheSqlLimit=2048&amp;zeroDateTimeBehavior=convertToNull&amp;traceProtocol=false&amp;useUnbufferedInput=false&amp;useReadAheadInput=false&amp;maintainTimeStats=false&amp;useServerPrepStmts&amp;cacheRSMetadata=true</url>
+    <url>jdbc:mysql://TFB-database:3306/hello_world?jdbcCompliantTruncation=false&amp;elideSetAutoCommits=true&amp;useLocalSessionState=true&amp;cachePrepStmts=true&amp;cacheCallableStmts=true&amp;alwaysSendSetIsolation=false&amp;prepStmtCacheSize=4096&amp;cacheServerConfiguration=true&amp;prepStmtCacheSqlLimit=2048&amp;zeroDateTimeBehavior=convertToNull&amp;traceProtocol=false&amp;useUnbufferedInput=false&amp;useReadAheadInput=false&amp;maintainTimeStats=false&amp;useServerPrepStmts&amp;cacheRSMetadata=true</url>
     <user>benchmarkdbuser</user>
     <password>benchmarkdbpass</password>
     <useUnicode/>

frameworks/Java/tapestry/setup.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' hello/src/main/webapp/WEB-INF/resin-web.xml
-
 fw_depends mysql java resin maven
 
 cd hello

frameworks/PHP/codeigniter/application/config/database.php

@@ -48,7 +48,7 @@
 $active_group = 'default';
 $query_builder = TRUE;
 
-$db['default']['hostname'] = 'localhost';
+$db['default']['hostname'] = 'TFB-database';
 $db['default']['username'] = 'benchmarkdbuser';
 $db['default']['password'] = 'benchmarkdbpass';
 $db['default']['database'] = 'hello_world';

frameworks/PHP/codeigniter/deploy/nginx.conf

@@ -10,122 +10,122 @@ error_log stderr error;
 
 
 events {
-    worker_connections  1024;
+  worker_connections  1024;
 }
 
 
 http {
-    include       /usr/local/nginx/conf/mime.types;
-    default_type  application/octet-stream;
+  include       /usr/local/nginx/conf/mime.types;
+  default_type  application/octet-stream;
 
-    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-    #                  '$status $body_bytes_sent "$http_referer" '
-    #                  '"$http_user_agent" "$http_x_forwarded_for"';
+  #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+  #                  '$status $body_bytes_sent "$http_referer" '
+  #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
-    #access_log  logs/access.log  main;
-    access_log off;
+  #access_log  logs/access.log  main;
+  access_log off;
 
-    sendfile        on;
-    #tcp_nopush     on;
+  sendfile        on;
+  #tcp_nopush     on;
 
-    #keepalive_timeout  0;
-    keepalive_timeout  65;
+  #keepalive_timeout  0;
+  keepalive_timeout  65;
 
-    #gzip  on;
-    
-    upstream fastcgi_backend {
-        server 127.0.0.1:9001;
-    }
+  #gzip  on;
 
-    server {
-        listen       8080;
-        server_name  localhost;
-
-        #charset koi8-r;
-
-        #access_log  logs/host.access.log  main;
-
-        #location / {
-        #    root   html;
-        #    index  index.html index.htm;
-        #}
-
-        #error_page  404              /404.html;
-
-        # redirect server error pages to the static page /50x.html
-        #
-        #error_page   500 502 503 504  /50x.html;
-        #location = /50x.html {
-        #    root   html;
-        #}
-
-        # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-        #
-        #location ~ \.php$ {
-        #    proxy_pass   http://127.0.0.1;
-        #}
-
-        root /home/pfalls/FrameworkBenchmarks/php-codeigniter/;
-        index  index.php;
-
-        location / {
-            try_files $uri $uri/ /index.php?$uri&$args;
-        }
-
-        # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
-        #
-        location ~ \.php$ {
-            try_files $uri =404;
-            fastcgi_pass   fastcgi_backend;
-            fastcgi_index  index.php;
-#            fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
-            fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /usr/local/nginx/conf/fastcgi_params;
-        }
-
-        # deny access to .htaccess files, if Apache's document root
-        # concurs with nginx's one
-        #
-        #location ~ /\.ht {
-        #    deny  all;
-        #}
-    }
+  upstream fastcgi_backend {
+    server 127.0.0.1:9001;
+  }
 
+  server {
+    listen       8080;
+    server_name  localhost;
 
-    # another virtual host using mix of IP-, name-, and port-based configuration
-    #
-    #server {
-    #    listen       8000;
-    #    listen       somename:8080;
-    #    server_name  somename  alias  another.alias;
-
-    #    location / {
-    #        root   html;
-    #        index  index.html index.htm;
-    #    }
+    #charset koi8-r;
+
+    #access_log  logs/host.access.log  main;
+
+    #location / {
+    #    root   html;
+    #    index  index.html index.htm;
     #}
 
+    #error_page  404              /404.html;
 
-    # HTTPS server
+    # redirect server error pages to the static page /50x.html
     #
-    #server {
-    #    listen       443;
-    #    server_name  localhost;
+    #error_page   500 502 503 504  /50x.html;
+    #location = /50x.html {
+    #    root   html;
+    #}
 
-    #    ssl                  on;
-    #    ssl_certificate      cert.pem;
-    #    ssl_certificate_key  cert.key;
+    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+    #
+    #location ~ \.php$ {
+    #    proxy_pass   http://127.0.0.1;
+    #}
 
-    #    ssl_session_timeout  5m;
+    root /home/pfalls/FrameworkBenchmarks/php-codeigniter/;
+    index  index.php;
 
-    #    ssl_protocols  SSLv2 SSLv3 TLSv1;
-    #    ssl_ciphers  HIGH:!aNULL:!MD5;
-    #    ssl_prefer_server_ciphers   on;
+    location / {
+      try_files $uri $uri/ /index.php?$uri&$args;
+    }
+
+    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+    #
+    location ~ \.php$ {
+      try_files $uri =404;
+      fastcgi_pass   fastcgi_backend;
+      fastcgi_index  index.php;
+      #            fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+      fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
+      include        /usr/local/nginx/conf/fastcgi_params;
+    }
 
-    #    location / {
-    #        root   html;
-    #        index  index.html index.htm;
-    #    }
+    # deny access to .htaccess files, if Apache's document root
+    # concurs with nginx's one
+    #
+    #location ~ /\.ht {
+    #    deny  all;
     #}
+  }
+
+
+  # another virtual host using mix of IP-, name-, and port-based configuration
+  #
+  #server {
+  #    listen       8000;
+  #    listen       somename:8080;
+  #    server_name  somename  alias  another.alias;
+
+  #    location / {
+  #        root   html;
+  #        index  index.html index.htm;
+  #    }
+  #}
+
+
+  # HTTPS server
+  #
+  #server {
+  #    listen       443;
+  #    server_name  localhost;
+
+  #    ssl                  on;
+  #    ssl_certificate      cert.pem;
+  #    ssl_certificate_key  cert.key;
+
+  #    ssl_session_timeout  5m;
+
+  #    ssl_protocols  SSLv2 SSLv3 TLSv1;
+  #    ssl_ciphers  HIGH:!aNULL:!MD5;
+  #    ssl_prefer_server_ciphers   on;
+
+  #    location / {
+  #        root   html;
+  #        index  index.html index.htm;
+  #    }
+  #}
 
 }

frameworks/PHP/codeigniter/setup.sh

@@ -2,7 +2,6 @@
 
 fw_depends mysql php7 nginx composer
 
-sed -i 's|localhost|'"${DBHOST}"'|g' application/config/database.php
 sed -i 's|root .*/FrameworkBenchmarks/php-codeigniter|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 

frameworks/PHP/codeigniter/setup_hhvm.sh

@@ -2,7 +2,6 @@
 
 fw_depends mysql php7 nginx composer hhvm
 
-sed -i 's|localhost|'"${DBHOST}"'|g' application/config/database.php
 sed -i 's|SourceRoot = .*/FrameworkBenchmarks/codeigniter|SourceRoot = '"${TROOT}"'|g' deploy/config.hdf
 sed -i 's|Path = .*/.hhvm.hhbc|Path = '"${TROOT}"'/.hhvm.bbhc|g' deploy/config.hdf
 sed -i 's|PidFile = .*/hhvm.pid|PidFile = '"${TROOT}"'/hhvm.pid|g' deploy/config.hdf

frameworks/PHP/yaf/app/conf/application.ini

@@ -5,7 +5,7 @@ application.library = APP_PATH "/library"
 application.library.directory = APP_PATH "/library"
 application.view.ext = phtml
 
-db.connections.default.dsn  = "mysql:host=localhost;port=3306;dbname=hello_world;charset=utf8"
+db.connections.default.dsn  = "mysql:host=TFB-database;port=3306;dbname=hello_world;charset=utf8"
 db.connections.default.user = benchmarkdbuser
 db.connections.default.pass = benchmarkdbpass
 db.connections.default.params.ATTR_ERRMODE = 2 ; PDO::ERRMODE_EXCEPTION

frameworks/PHP/yaf/setup.sh

@@ -2,8 +2,7 @@
 
 fw_depends mysql php5 yaf nginx
 
-sed -i 's|host=localhost|host='"${DBHOST}"'|g' app/conf/application.ini
-sed -i 's|root .*/FrameworkBenchmarks/php-yaf|root '"${TROOT}"'|g' deploy/nginx.conf 
+sed -i 's|root .*/FrameworkBenchmarks/php-yaf|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
 php-fpm --fpm-config $FWROOT/toolset/setup/linux/languages/php/php-fpm.conf -g $TROOT/deploy/php-fpm.pid

frameworks/PHP/yii2/app/index.php

@@ -14,7 +14,7 @@ $config = [
     'components' => [
         'db' => [
             'class' => 'yii\db\Connection',
-            'dsn' => 'mysql:host=localhost;dbname=hello_world',
+            'dsn' => 'mysql:host=TFB-database;dbname=hello_world',
             'username' => 'benchmarkdbuser',
             'password' => 'benchmarkdbpass',
             'charset' => 'utf8',

frameworks/PHP/yii2/setup.sh

@@ -2,7 +2,6 @@
 
 fw_depends mysql php5 nginx composer
 
-sed -i 's|localhost|'"${DBHOST}"'|g' app/index.php
 sed -i 's|root .*/FrameworkBenchmarks/php-yii2|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 

frameworks/PHP/yii2/setup_hhvm.sh

@@ -2,7 +2,6 @@
 
 fw_depends mysql php5 nginx composer hhvm
 
-sed -i 's|localhost|'"${DBHOST}"'|g' app/index.php
 sed -i 's|SourceRoot = .*/FrameworkBenchmarks/Yii2|SourceRoot = '"${TROOT}"'|g' deploy/config.hdf
 sed -i 's|Path = .*/.hhvm.hhbc|Path = '"${TROOT}"'/.hhvm.bbhc|g' deploy/config.hdf
 sed -i 's|PidFile = .*/hhvm.pid|PidFile = '"${TROOT}"'/hhvm.pid|g' deploy/config.hdf

frameworks/Python/api_hour/aiohttp.web/etc/hello/main/main.yaml

@@ -1,7 +1,7 @@
 ---
 engines:
   pg:
-    host: 127.0.0.1
+    host: TFB-database
     port: 5432
     dbname: hello_world
     user: benchmarkdbuser
@@ -9,14 +9,14 @@ engines:
     minsize: 22
     maxsize: 22
   mysql:
-    host: 127.0.0.1
+    host: TFB-database
     port: 3306
     db: hello_world
     user: benchmarkdbuser
     pwd: benchmarkdbpass
     minsize: 22
     maxsize: 22
-  redis:
-    host: 127.0.0.1
-    port: 6379
-    poolsize: 40
+#redis:
+#    host: TFB-database
+#    port: 6379
+#    poolsize: 40

frameworks/Python/api_hour/aiohttp.web/hello/__init__.py

@@ -27,16 +27,16 @@ class Container(api_hour.Container):
         # routes
         self.servers['http'].router.add_route('GET', '/json', endpoints.world.json)
         self.servers['http'].router.add_route('GET', '/db', endpoints.world.db)
-        self.servers['http'].router.add_route('GET', '/db_redis', endpoints.world.db_redis)
+        # self.servers['http'].router.add_route('GET', '/db_redis', endpoints.world.db_redis)
         self.servers['http'].router.add_route('GET', '/db_mysql', endpoints.world.db_mysql)
         self.servers['http'].router.add_route('GET', '/queries', endpoints.world.queries)
-        self.servers['http'].router.add_route('GET', '/queries_redis', endpoints.world.queries_redis)
+        # self.servers['http'].router.add_route('GET', '/queries_redis', endpoints.world.queries_redis)
         self.servers['http'].router.add_route('GET', '/queries_mysql', endpoints.world.queries_mysql)
         self.servers['http'].router.add_route('GET', '/fortunes', endpoints.world.fortunes)
-        self.servers['http'].router.add_route('GET', '/fortunes_redis', endpoints.world.fortunes_redis)
+        # self.servers['http'].router.add_route('GET', '/fortunes_redis', endpoints.world.fortunes_redis)
         self.servers['http'].router.add_route('GET', '/fortunes_mysql', endpoints.world.fortunes_mysql)
         self.servers['http'].router.add_route('GET', '/updates', endpoints.world.updates)
-        self.servers['http'].router.add_route('GET', '/updates_redis', endpoints.world.updates_redis)
+        # self.servers['http'].router.add_route('GET', '/updates_redis', endpoints.world.updates_redis)
         self.servers['http'].router.add_route('GET', '/updates_mysql', endpoints.world.updates_mysql)
         self.servers['http'].router.add_route('GET', '/plaintext', endpoints.world.plaintext)
 
@@ -74,11 +74,11 @@ class Container(api_hour.Container):
                 use_unicode=True,
                 loop=self.loop))
         yield from asyncio.wait([self.engines['pg']], return_when=asyncio.ALL_COMPLETED)
-        self.engines['redis'] = yield from asyncio_redis.Pool.create(host=self.config['engines']['redis']['host'],
-                                                                     port=self.config['engines']['redis']['port'],
-                                                                     poolsize=self.config['engines']['redis']['poolsize'],
-                                                                     loop=self.loop,
-                                                                     protocol_class=HiRedisProtocol)
+        # self.engines['redis'] = yield from asyncio_redis.Pool.create(host=self.config['engines']['redis']['host'],
+        #                                                              port=self.config['engines']['redis']['port'],
+        #                                                              poolsize=self.config['engines']['redis']['poolsize'],
+        #                                                              loop=self.loop,
+        #                                                              protocol_class=HiRedisProtocol)
 
         LOG.info('All engines ready !')
 

frameworks/Python/api_hour/aiohttp.web/setup.sh

@@ -2,8 +2,6 @@
 
 fw_depends python3
 
-sed -i 's|host: 127.0.0.1|host: '${DBHOST}'|g' aiohttp.web/etc/hello/main/main.yaml
-
 pip3 install --install-option="--prefix=${PY3_ROOT}" -r $TROOT/requirements.txt
 
 cd $TROOT/aiohttp.web

frameworks/Python/cherrypy/app.py

@@ -120,7 +120,7 @@ if __name__ == "__main__":
     # Register the SQLAlchemy plugin
     from saplugin import SAEnginePlugin
     DBDRIVER = 'mysql'
-    DATABASE_URI = '%s://benchmarkdbuser:benchmarkdbpass@127.0.0.1:3306/hello_world?charset=utf8' % (DBDRIVER)
+    DATABASE_URI = '%s://benchmarkdbuser:benchmarkdbpass@TFB-database:3306/hello_world?charset=utf8' % (DBDRIVER)
     SAEnginePlugin(cherrypy.engine, DATABASE_URI).subscribe()
     
     # Register the SQLAlchemy tool

frameworks/Python/cherrypy/setup.sh

@@ -2,8 +2,6 @@
 
 fw_depends mysql python2
 
-sed -i 's|127.0.0.1|'${DBHOST}'|g' app.py
-
 pip install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements.txt
 
 python app.py &

frameworks/Python/cherrypy/setup_py3.sh

@@ -2,8 +2,6 @@
 
 fw_depends mysql python3
 
-sed -i 's|127.0.0.1|'${DBHOST}'|g' app.py
-
 pip3 install --install-option="--prefix=${PY3_ROOT}" -r $TROOT/requirements.txt
 
 python3 app.py &

frameworks/Python/klein/app.py

@@ -18,7 +18,7 @@ from sqlalchemy.types import String, Integer, Unicode
 if sys.version_info[0] == 3:
     xrange = range
 
-DATABASE_URI = 'mysql://benchmarkdbuser:benchmarkdbpass@127.0.0.1:3306/hello_world?charset=utf8'
+DATABASE_URI = 'mysql://benchmarkdbuser:benchmarkdbpass@TFB-database:3306/hello_world?charset=utf8'
 
 Base = declarative_base()
 db_engine = create_engine(DATABASE_URI)

frameworks/Python/klein/setup.sh

@@ -2,8 +2,6 @@
 
 fw_depends mysql python2
 
-sed -i 's|127.0.0.1|'${DBHOST}'|g' app.py
-
 pip install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements.txt
 
 python app.py &

toolset/setup/linux/languages/php/php.ini

@@ -899,8 +899,8 @@ extension=mongo.so
 ;extension=php_pspell.dll
 ;extension=php_shmop.dll
 
-; The MIBS data available in the PHP distribution must be installed. 
-; See http://www.php.net/manual/en/snmp.installation.php 
+; The MIBS data available in the PHP distribution must be installed.
+; See http://www.php.net/manual/en/snmp.installation.php
 ;extension=php_snmp.dll
 
 ;extension=php_soap.dll
@@ -1888,4 +1888,4 @@ yaf.name_suffix = 1
 yaf.name_separator=
 yaf.cache_config = 1
 yaf.environ = product
-yaf.use_namespace = 1
+yaf.use_namespace = 1