update vagrantfile and test/bench for new log lines

This commit is contained in:
Danny Coates 2014-02-25 16:53:33 -08:00
Родитель f9b850d771
Коммит 7332cb4f6e
2 изменённых файлов: 8 добавлений и 7 удалений

13
Vagrantfile поставляемый
Просмотреть файл

@ -6,18 +6,19 @@ VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "precise64" config.vm.box = "precise64"
config.vm.box_url = "http://files.vagrantup.com/precise64.box" config.vm.box_url = "http://files.vagrantup.com/precise64.box"
config.vm.network :forwarded_port, guest: 9000, host: 9000, auto_correct: true #config.vm.network :forwarded_port, guest: 9000, host: 9000, auto_correct: true
config.ssh.forward_agent = true config.ssh.forward_agent = true
config.vm.provider "virtualbox" do |v| config.vm.provider "virtualbox" do |v|
v.memory = 1024 v.memory = 2048
v.customize ["modifyvm", :id, "--cpus", "4"]
end end
config.vm.provider "vmware_fusion" do |v| config.vm.provider "vmware_fusion" do |v|
v.vmx["memsize"] = "1024" v.vmx["memsize"] = "2048"
v.vmx["numvcpus"] = "2" v.vmx["numvcpus"] = "4"
end end
script = script =
"wget -q http://nodejs.org/dist/v0.10.23/node-v0.10.23-linux-x64.tar.gz;" \ "wget -q http://nodejs.org/dist/v0.10.26/node-v0.10.26-linux-x64.tar.gz;" \
"tar --strip-components 1 -C /usr/local -xzf node-v0.10.23-linux-x64.tar.gz;" \ "tar --strip-components 1 -C /usr/local -xzf node-v0.10.26-linux-x64.tar.gz;" \
"apt-get -qq update;" \ "apt-get -qq update;" \
"export DEBIAN_FRONTEND=noninteractive;" \ "export DEBIAN_FRONTEND=noninteractive;" \
"apt-get -qq install curl mysql-server-5.5 libgmp-dev git build-essential python-dev python-pip libevent-dev tmux htop;" \ "apt-get -qq install curl mysql-server-5.5 libgmp-dev git build-essential python-dev python-pip libevent-dev tmux htop;" \

Просмотреть файл

@ -40,7 +40,7 @@ server.stderr
if (json.level > 30 && json.op !== 'console') { if (json.level > 30 && json.op !== 'console') {
console.log(json) console.log(json)
} }
if (json.op && json.op === 'server.response') { if (json.op && json.op === 'request.summary') {
if (!start) start = Date.now() if (!start) start = Date.now()
requests++ requests++
if (json.code === 200) { pass++ } else { fail++ } if (json.code === 200) { pass++ } else { fail++ }