Browse Source

Revel benchmark working!

Rob Figueiredo 12 years ago
parent
commit
cedc6f4196
4 changed files with 15 additions and 15 deletions
  1. 1 1
      config/benchmark_profile
  2. 5 5
      installer.py
  3. 5 4
      revel/setup.py
  4. 4 5
      revel/src/benchmark/conf/app.conf

+ 1 - 1
config/benchmark_profile

@@ -3,7 +3,7 @@ export RESIN_HOME=~/FrameworkBenchmarks/installs/resin-4.0.34
 export GRAILS_HOME=~/FrameworkBenchmarks/installs/grails-2.1.1
 export GRAILS_HOME=~/FrameworkBenchmarks/installs/grails-2.1.1
 export VERTX_HOME=~/FrameworkBenchmarks/installs/vert.x-1.3.1.final
 export VERTX_HOME=~/FrameworkBenchmarks/installs/vert.x-1.3.1.final
 export GOROOT=~/FrameworkBenchmarks/installs/go
 export GOROOT=~/FrameworkBenchmarks/installs/go
-export GOPATH=~/FrameworkBenchmarks/go:~/FrameworkBenchmarks/webgo:$GOROOT
+export GOPATH=~/FrameworkBenchmarks/go:~/FrameworkBenchmarks/webgo:~/FrameworkBenchmarks/revel
 export TOMCAT_HOME=~/FrameworkBenchmarks/installs/apache-tomcat-7.0.35
 export TOMCAT_HOME=~/FrameworkBenchmarks/installs/apache-tomcat-7.0.35
 export NODE_HOME=~/FrameworkBenchmarks/installs/node-v0.10.2-linux-x64
 export NODE_HOME=~/FrameworkBenchmarks/installs/node-v0.10.2-linux-x64
 export PLAY_HOME=~/FrameworkBenchmarks/installs/play-2.1.1
 export PLAY_HOME=~/FrameworkBenchmarks/installs/play-2.1.1

+ 5 - 5
installer.py

@@ -21,8 +21,8 @@ class Installer:
     # Prerequisites
     # Prerequisites
     #######################################
     #######################################
     self.__run_command("sudo apt-get update", True)
     self.__run_command("sudo apt-get update", True)
-    self.__run_command("sudo apt-get upgrade", True)    
-    self.__run_command("sudo apt-get install build-essential libpcre3 libpcre3-dev libpcrecpp0 libssl-dev zlib1g-dev python-software-properties unzip git-core libcurl4-openssl-dev libbz2-dev libmysqlclient-dev mongodb-clients libreadline6-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt-dev libgdbm-dev ncurses-dev automake libffi-dev htop libtool bison libevent-dev libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 liborc-0.4-0 libwxbase2.8-0 libwxgtk2.8-0 libgnutls-dev libjson0-dev libmcrypt-dev libicu-dev cmake", True)
+    self.__run_command("sudo apt-get upgrade", True)
+    self.__run_command("sudo apt-get install build-essential libpcre3 libpcre3-dev libpcrecpp0 libssl-dev zlib1g-dev python-software-properties unzip git-core libcurl4-openssl-dev libbz2-dev libmysqlclient-dev mongodb-clients libreadline6-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt-dev libgdbm-dev ncurses-dev automake libffi-dev htop libtool bison libevent-dev libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 liborc-0.4-0 libwxbase2.8-0 libwxgtk2.8-0 libgnutls-dev libjson0-dev libmcrypt-dev libicu-dev cmake mercurial", True)
 
 
     self.__run_command("cp ../config/benchmark_profile ../../.bash_profile")
     self.__run_command("cp ../config/benchmark_profile ../../.bash_profile")
     self.__run_command("sudo sh -c \"echo '*               soft    nofile          8192' >> /etc/security/limits.conf\"")
     self.__run_command("sudo sh -c \"echo '*               soft    nofile          8192' >> /etc/security/limits.conf\"")
@@ -91,7 +91,7 @@ class Installer:
     #
     #
     # go
     # go
     #
     #
-    
+
     self.__run_command("curl http://go.googlecode.com/files/go1.1rc1.linux-amd64.tar.gz | tar xvz")
     self.__run_command("curl http://go.googlecode.com/files/go1.1rc1.linux-amd64.tar.gz | tar xvz")
 
 
     #
     #
@@ -342,14 +342,14 @@ class Installer:
 
 
     # Insert data
     # Insert data
     mysql -uroot -psecret < create.sql
     mysql -uroot -psecret < create.sql
-    
+
     ##############################
     ##############################
     # Postgres
     # Postgres
     ##############################
     ##############################
     sudo useradd benchmarkdbuser -p benchmarkdbpass
     sudo useradd benchmarkdbuser -p benchmarkdbpass
     sudo -u postgres psql template1 < create-postgres-database.sql
     sudo -u postgres psql template1 < create-postgres-database.sql
     sudo -u benchmarkdbuser psql hello_world < create-postgres.sql
     sudo -u benchmarkdbuser psql hello_world < create-postgres.sql
-    
+
     sudo mv postgresql.conf /etc/postgresql/9.1/main/postgresql.conf
     sudo mv postgresql.conf /etc/postgresql/9.1/main/postgresql.conf
     sudo mv pg_hba.conf /etc/postgresql/9.1/main/pg_hba.conf
     sudo mv pg_hba.conf /etc/postgresql/9.1/main/pg_hba.conf
     sudo -u postgres -H /etc/init.d/postgresql restart
     sudo -u postgres -H /etc/init.d/postgresql restart

+ 5 - 4
revel/setup.py

@@ -2,12 +2,13 @@ import subprocess
 import sys
 import sys
 import os
 import os
 import setup_util
 import setup_util
+import time
 
 
 def start(args):
 def start(args):
-  # setup_util.replace_text("go/src/hello/hello.go", "tcp\(.*:3306\)", "tcp(" + args.database_host + ":3306)")
-  subprocess.call("go get github.com/robfig/revel/cmd", shell=True, cwd="go")
-  subprocess.call("go build -o bin/revel github.com/robfig/revel/cmd", shell=True, cwd="go")
-  subprocess.Popen("bin/revel run benchmark prod".rsplit(" "), cwd="go")
+  setup_util.replace_text("revel/src/benchmark/conf/app.conf", "tcp\(.*:3306\)", "tcp(" + args.database_host + ":3306)")
+  subprocess.call("go get github.com/robfig/revel/cmd", shell=True, cwd="revel")
+  subprocess.call("go build -o bin/revel github.com/robfig/revel/cmd", shell=True, cwd="revel")
+  subprocess.Popen("bin/revel run benchmark prod".rsplit(" "), cwd="revel")
   return 0
   return 0
 
 
 def stop():
 def stop():

+ 4 - 5
revel/src/benchmark/conf/app.conf

@@ -4,12 +4,13 @@ http.port=8080
 
 
 db.driver = mysql
 db.driver = mysql
 db.import = github.com/go-sql-driver/mysql
 db.import = github.com/go-sql-driver/mysql
-db.spec = root:@tcp(localhost:3306)/hello_world?charset=utf8
+db.spec = benchmarkdbuser:benchmarkdbpass@tcp(localhost:3306)/hello_world?charset=utf8
+
+results.pretty=false
+results.chunked=false
 
 
 [dev]
 [dev]
 mode.dev=true
 mode.dev=true
-results.pretty=true
-results.staging=true
 watch=true
 watch=true
 
 
 log.trace.output = stderr
 log.trace.output = stderr
@@ -19,8 +20,6 @@ log.error.output = stderr
 
 
 [prod]
 [prod]
 mode.dev=false
 mode.dev=false
-results.pretty=false
-results.staging=false
 watch=false
 watch=false
 
 
 log.trace.output = off
 log.trace.output = off