rhoconnect 3.0.5 → 3.0.6

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## 3.0.5 (not released)
+## 3.0.6 (2011-11-15)
+* #20022889 - support for GET/POST /api/application routes
+* #20609683 - support 'append' parameter in 'set_db_doc' REST API
+* #20910767 - fix for params modification in before filter (#1802,#1804) and fixing incorrect blob create spec
+* #20917129 - adding spec for checking 'Cache-Control:no-cache' and 'Pragma:no-cache' response headers
+
+## 3.0.5 (2011-10-21)
 * use redis 2.4 by default
 * #17447481 - auto-renewal of expired C2DM tokens
 * #19723593 - re-creating Client if clientregister call is made with unknown client id

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.0.5)
+    rhoconnect (3.0.6)
       bundler (~> 1.0)
       json (~> 1.5.0)
-      rake (= 0.9.2)
+      rake (~> 0.9.2)
       redis (>= 2.2.0)
       resque (~> 1.19.0)
       rest-client (~> 1.6.1)
@@ -38,23 +38,23 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.1)
-    fpm (0.3.9)
+    fpm (0.3.10)
       json
     highline (1.6.2)
     json (1.5.4)
-    mime-types (1.16)
+    mime-types (1.17.1)
     multi_json (1.0.3)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.1.4)
     nokogiri (1.5.0)
-    rack (1.3.4)
+    rack (1.3.5)
     rack-protection (1.1.4)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2)
-    rcov (0.9.10)
+    rcov (0.9.11)
     redis (2.2.2)
     redis-namespace (1.0.3)
       redis (< 3.0.0)
@@ -76,9 +76,9 @@ GEM
     ruby-hmac (0.4.0)
     rubyzip (0.9.4)
     sinatra (1.3.1)
-      rack (~> 1.3, >= 1.3.4)
-      rack-protection (~> 1.1, >= 1.1.2)
-      tilt (~> 1.3, >= 1.3.3)
+      rack (>= 1.3.4, ~> 1.3)
+      rack-protection (>= 1.1.2, ~> 1.1)
+      tilt (>= 1.3.3, ~> 1.3)
     sqlite3 (1.3.4)
     templater (1.0.0)
       diff-lcs (>= 1.1.2)

data/README.md

@@ -4,7 +4,7 @@ RhoConnect is an app integration server which keeps enterprise data current and
 
 More Info
 -------------------------------------------------------------
-  * Intro to Rhodes & RhoConnect: <http://docs.rhomobile.com>
-  * RhoConnect:               	   <http://docs.rhomobile.com/rhoconnect/introduction>
-  * Tutorial:                  <http://docs.rhomobile.com/rhoconnect/tutorial> 
-  * RDoc (still rough):        <http://rdoc.info/projects/rhomobile/rhoconnect>
+  * Intro to Rhodes & RhoConnect: 	<http://docs.rhomobile.com>
+  * RhoConnect:               	   	<http://docs.rhomobile.com/rhoconnect/introduction>
+  * Tutorial:                  		<http://docs.rhomobile.com/rhoconnect/tutorial> 
+  * RDoc (still rough):        		<http://rdoc.info/projects/rhomobile/rhoconnect>

data/Rakefile

@@ -1,10 +1,10 @@
 require 'rubygems'
 load 'tasks/redis.rake'
-load 'installer/utils/nix_installation.rake'
-load 'installer/utils/package_upload/repos.rake'
 
 require 'bundler'
 Bundler.setup(:default, :development, :test)
+load 'installer/utils/nix_installation.rake'
+load 'installer/utils/package_upload/repos.rake'
 
 require 'yaml'
 $:.unshift File.join(File.dirname(__FILE__),'lib')
@@ -93,7 +93,7 @@ task :archive do
 end
 
 # Debian and RPM package building tasks
-def build_pkg(dist, arch, deps)
+def build_pkg(dist, arch, deps, use_bench_tarball=false)
   start_dir       = `pwd`.strip
   workspace      = "#{start_dir}/pkg/workspace" 
   version        = Rhoconnect::VERSION
@@ -114,6 +114,9 @@ def build_pkg(dist, arch, deps)
   system("cp -r installer/unix-like/* #{workspace}/unix-like")
   system("cp pkg/#{gem_name} #{workspace}")
 
+  # Create bench tarball
+  `git archive --format=tar --prefix=bench/ HEAD:bench | gzip > #{workspace}/bench.tar.gz` if use_bench_tarball
+
   # cd into the pkg dir so that fpm will create the package into the pkg dir.
   Dir.chdir("./pkg")
 
@@ -136,33 +139,43 @@ def build_pkg(dist, arch, deps)
   Dir.chdir(start_dir)
 end #build_pkg
 
+DEB_DEPS = [
+  "wget (>= 1.0)", "make (>= 3.0)", "patch (>= 2.0)",
+  "build-essential (>= 0)",
+  "zlib1g (>= 1.2.3)", "zlib1g-dev (>= 1.2.3)",
+  "libssl0.9.8 (>= 0)", "libssl-dev (>= 0.9.8)",
+  "libcurl4-openssl-dev (>= 0)",
+  "libreadline5 (>= 0)", "libreadline5-dev (>= 0)",
+  # "libreadline6 (>= 0)", "libreadline6-dev (>= 0)",
+  "libsqlite3-0 (>= 3.6.22-1)", "libsqlite3-dev (>= 3.6.22-1)"
+]
+
 desc "Build Debian DEB rhoconnect-#{Rhoconnect::VERSION}_all.deb package into the pkg directory"
 task "build:deb" => :build do
-  deps = [
-    "wget (>= 1.0)", "make (>= 3.0)", "patch (>= 2.0)",
-    "build-essential (>= 0)",
-    "zlib1g (>= 1.2.3)", "zlib1g-dev (>= 1.2.3)",
-    "libssl0.9.8 (>= 0)", "libssl-dev (>= 0.9.8)",
-    "libcurl4-openssl-dev (>= 0)",
-    "libreadline5 (>= 0)", "libreadline5-dev (>= 0)",  
-    # "libreadline6 (>= 0)", "libreadline6-dev (>= 0)",
-    "libsqlite3-0 (>= 3.6.22-1)", "libsqlite3-dev (>= 3.6.22-1)"
-  ]
-
-  build_pkg "deb", "all", deps
-end #build:deb
+  build_pkg "deb", "all", DEB_DEPS
+end
+
+desc "Build Debian DEB rhoconnect-#{Rhoconnect::VERSION}_all.deb package into the pkg directory"
+task "build:bench:deb" => :build do
+  build_pkg "deb", "all", DEB_DEPS, true
+end
+
+RPM_DEPS = [
+  "wget >= 1.0", "make >= 3.0", "patch >= 2.0",
+  "gcc-c++ >= 4.1.2",
+  "zlib >= 1.2.3", "zlib-devel >= 1.2.3",
+  "curl >= 7.15.5", "curl-devel >= 7.15.5",
+  "pcre >= 6.6", "pcre-devel >= 6.6",
+  "openssl >= 0.9.8e", "openssl-devel >= 0.9.8e",
+  "readline-devel >= 5.1", "readline-devel >= 5.1"
+]
 
 desc "Build Red Hat RPM rhoconnect-#{Rhoconnect::VERSION}.noarch.rpm package into the pkg directory"
 task "build:rpm" => :build do
-  deps = [
-    "wget >= 1.0", "make >= 3.0", "patch >= 2.0",
-    "gcc-c++ >= 4.1.2",
-    "zlib >= 1.2.3", "zlib-devel >= 1.2.3",
-    "curl >= 7.15.5", "curl-devel >= 7.15.5",
-    "pcre >= 6.6", "pcre-devel >= 6.6",
-    "openssl >= 0.9.8e", "openssl-devel >= 0.9.8e",
-    "readline-devel >= 5.1", "readline-devel >= 5.1"
-  ]
-
-  build_pkg "rpm", "noarch", deps
-end #build:rpm
+  build_pkg "rpm", "noarch", RPM_DEPS
+end
+
+desc "Build Red Hat RPM benchmark rhoconnect-#{Rhoconnect::VERSION}.noarch.rpm package into the pkg directory"
+task "build:bench:rpm" => :build do
+  build_pkg "rpm", "noarch", RPM_DEPS, true
+end

data/bench/bench_runner.rb

@@ -17,10 +17,9 @@ begin
   puts `bundle update`
   puts
   
-  # Skip the following lines because becnchapp Gemfile uses path to rhoconnect code 
-  # puts "Installing rhoconnect ..."
-  # puts `rake install`
-  # puts
+  puts "Installing rhoconnect ..."
+  puts `rake install`
+  puts
 
   Dir.chdir "bench/benchapp"  #puts Dir.pwd
   puts "Checking bench application dependencies ..."
@@ -110,4 +109,4 @@ end
 
 puts "Script #{$0} is finished at #{Time.now.to_s}"
 puts ""
-# $stdout = orig_stdout #restore stdout
+# $stdout = orig_stdout #restore stdout

data/bench/benchapp/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rhoconnect', :path => '../../'
+gem 'rhoconnect'
 
 # Helps with some of the limitations of green threads, not needed in ruby 1.9.x
 gem 'SystemTimer', '~> 1.2.3', :platforms => :ruby_18

data/bench/benchapp/Gemfile.lock

@@ -1,18 +1,3 @@
-PATH
-  remote: ../../
-  specs:
-    rhoconnect (3.0.0)
-      bundler (~> 1.0)
-      json (~> 1.5.0)
-      rake (= 0.9.2)
-      redis (>= 2.2.0)
-      resque (~> 1.17.0)
-      rest-client (~> 1.6.1)
-      rubyzip (~> 0.9.4)
-      sinatra (= 1.2.7)
-      templater (~> 1.0.0)
-      uuidtools (>= 2.1.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -23,7 +8,7 @@ GEM
     dbi (0.4.5)
       deprecated (= 2.0.1)
     deprecated (2.0.1)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     eventmachine (0.12.10)
     extlib (0.9.15)
     highline (1.6.2)
@@ -33,24 +18,37 @@ GEM
       bouncy-castle-java
     jruby-rack (1.0.10)
     json (1.5.4)
-    json (1.5.4-java)
-    mime-types (1.16)
-    rack (1.3.2)
+    mime-types (1.17.2)
+    multi_json (1.0.3)
+    rack (1.3.5)
+    rack-protection (1.1.4)
+      rack
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2)
-    rcov (0.9.10)
-    rcov (0.9.10-java)
+    rcov (0.9.11)
+    rcov (0.9.11-java)
     redis (2.2.2)
     redis-namespace (1.0.3)
       redis (< 3.0.0)
-    resque (1.17.1)
-      json (< 1.6, >= 1.4.6)
+    resque (1.19.0)
+      multi_json (~> 1.0)
       redis-namespace (~> 1.0.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
+    rhoconnect (3.0.6)
+      bundler (~> 1.0)
+      json (~> 1.5.0)
+      rake (= 0.9.2)
+      redis (>= 2.2.0)
+      resque (~> 1.19.0)
+      rest-client (~> 1.6.1)
+      rubyzip (~> 0.9.4)
+      sinatra (~> 1.3)
+      templater (~> 1.0.0)
+      uuidtools (>= 2.1.1)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -60,9 +58,10 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     rubyzip (0.9.4)
-    sinatra (1.2.7)
-      rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
+    sinatra (1.3.1)
+      rack (>= 1.3.4, ~> 1.3)
+      rack-protection (>= 1.1.2, ~> 1.1)
+      tilt (>= 1.3.3, ~> 1.3)
     sqlite3 (1.3.4)
     templater (1.0.0)
       diff-lcs (>= 1.1.2)
@@ -98,7 +97,7 @@ DEPENDENCIES
   jruby-openssl (>= 0.7.4)
   rack-test (>= 0.5.3)
   rcov (>= 0.9.8)
-  rhoconnect!
+  rhoconnect
   rspec (~> 2.6.0)
   sqlite3 (>= 1.3.3)
   thin

data/bench/benchapp/config.ru

@@ -24,11 +24,15 @@ Rhoconnect::Server.enable  :raise_errors
 Rhoconnect::Server.set     :secret,      'cf8e8a1d3653fcfb2332d8b1af9f6762c3c45ea12144bb5f15cd5618cc8e453b45a02dd304bdd791489dcd1ae35b807e4b4f4e6f7faedb551e76996c0f3c11c6'
 Rhoconnect::Server.set     :root,        ROOT_PATH
 Rhoconnect::Server.use     Rack::Static, :urls => ["/data"], :root => Rhoconnect::Server.root
+Rhoconnect::Server.disable :logging
 
 # Load our rhoconnect application
 $:.unshift ROOT_PATH if RUBY_VERSION =~ /1.9/ # FIXME: see PT story #16682771
 require 'application'
 
+#STDERR=nil
+#STDOUT=nil
+
 # Setup the url map
 run Rack::URLMap.new \
 	"/"         => Rhoconnect::Server.new,

data/bench/benchapp/log/passenger.3000.log

@@ -0,0 +1 @@
+2011/10/24 15:33:01 [error] 35864#0: *4 "/Users/mzverev/Projects/master/rhoconnect/bench/benchapp/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "HEAD / HTTP/1.1", host: "0.0.0.0"

data/bench/benchapp/log/passenger.9292.log

@@ -0,0 +1,59 @@
+2011/10/24 15:35:37 [error] 35907#0: *4 "/Users/mzverev/Projects/master/rhoconnect/bench/benchapp/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "HEAD / HTTP/1.1", host: "0.0.0.0"
+2011/10/24 15:35:43 [error] 35907#0: *5 open() "/Users/mzverev/Projects/master/rhoconnect/bench/benchapp/public/api/admin/login" failed (2: No such file or directory), client: 127.0.0.1, server: _, request: "POST /api/admin/login HTTP/1.1", host: "localhost:9292"
+2011/10/24 15:36:35 [error] 35907#0: *7 open() "/Users/mzverev/Projects/master/rhoconnect/bench/benchapp/public/console/logout" failed (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET /console/logout HTTP/1.1", host: "localhost:9292", referrer: "http://localhost:9292/console/"
+2011/10/24 15:36:35 [error] 35907#0: *7 open() "/Users/mzverev/Projects/master/rhoconnect/bench/benchapp/public/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET /favicon.ico HTTP/1.1", host: "localhost:9292"
+2011/10/24 15:36:41 [error] 35907#0: *7 "/Users/mzverev/Projects/master/rhoconnect/bench/benchapp/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET / HTTP/1.1", host: "localhost:9292"
+2011/10/24 15:36:41 [error] 35907#0: *7 open() "/Users/mzverev/Projects/master/rhoconnect/bench/benchapp/public/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET /favicon.ico HTTP/1.1", host: "localhost:9292"
+2011/10/24 15:38:06 [error] 35949#0: *4 "/Users/mzverev/Projects/master/rhoconnect/bench/benchapp/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "HEAD / HTTP/1.1", host: "0.0.0.0"
+2011/10/24 15:38:11 [error] 35949#0: *5 open() "/Users/mzverev/Projects/master/rhoconnect/bench/benchapp/public/console" failed (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET /console HTTP/1.1", host: "localhost:9292"
+2011/10/24 15:38:11 [error] 35949#0: *5 open() "/Users/mzverev/Projects/master/rhoconnect/bench/benchapp/public/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET /favicon.ico HTTP/1.1", host: "localhost:9292"
+[03:39:29 PM 2011-10-24] Rhoconnect Server v3.0.6 started...
+:public is no longer used to avoid overloading Module#public, use :public_folder instead
+	from /Library/Ruby/Gems/1.8/gems/resque-1.19.0/lib/resque/server.rb:12
+[ pid=35977 thr=0x10079a000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:06.175 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x101d3a000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:06.181 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x101ea6000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:06.184 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x101c9e000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:06.188 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x101eda000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:06.193 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x1007ce000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:06.199 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x101c6a000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:06.205 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x101b32000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:06.208 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x101e0a000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:06.210 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x101f0e000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:06.212 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x101dd6000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:06.214 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x101b66000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:06.309 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x101e3e000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:06.432 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x100766000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:06.642 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x101b9a000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:06.663 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x101c36000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:06.694 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x101e3e000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:50.370 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x101dd6000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:51.333 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x101b32000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:51.346 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=35977 thr=0x101b9a000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 15:40:51.347 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[04:41:27 PM 2011-10-24] Rhoconnect Server v3.0.6 started...
+:public is no longer used to avoid overloading Module#public, use :public_folder instead
+	from /Library/Ruby/Gems/1.8/gems/resque-1.19.0/lib/resque/server.rb:12
+[ pid=36271 thr=0x101d3e000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.131 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101c3a000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.135 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x10079a000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.137 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101b6a000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.140 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101ace000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.142 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101e0e000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.149 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101cd6000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.151 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101a66000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.153 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101b9e000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.155 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101b02000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.162 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101c06000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.164 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101a32000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.170 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101a9a000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.176 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x100732000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.179 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x1007ce000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.185 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101d72000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.191 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101d0a000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.193 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101da6000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.195 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101dda000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.197 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101b36000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.744 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101ca2000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.777 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101bd2000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:34.833 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x100766000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:35.133 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.
+[ pid=36271 thr=0x101c6e000 file=ext/nginx/HelperAgent.cpp:921 time=2011-10-24 16:49:35.150 ]: Couldn't forward the HTTP response back to the HTTP client: It seems the user clicked on the 'Stop' button in his browser.

data/bench/benchapp/settings/settings.yml

@@ -10,10 +10,12 @@
   :syncserver: http://localhost:9292/api/application/
   :licensefile: settings/license.key
   :redis: localhost:6379
+  :log_disabled: true
 :development:
   :syncserver: http://localhost:9292/api/application/
   :licensefile: settings/license.key
   :redis: localhost:6379
+  :log_disabled: true
 :production: 
   :syncserver: http://localhost:9292/api/application/
   :licensefile: settings/license.key

data/bench/distr_bench/distr_bench

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..','lib'))
+require 'bench'
+
+Bench::DistributedCli.start

data/bench/distr_bench/distr_bench_main

@@ -0,0 +1,99 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
+require 'bench'
+
+def process_results
+  finished_data = Bench.get_server_state("bench_statistics_data")
+  finished_data.each do |session,session_data|
+    puts "Client data for #{session} : startTime (#{session_data['start_time']}), endTime (#{session_data['end_time']})"
+    @total_count += session_data['count'].to_i
+    @start_time = session_data['start_time'].to_f unless @start_time > 0.0 and session_data['start_time'].to_f >= @start_time
+    @end_time = session_data['end_time'].to_f unless session_data['end_time'].to_f <= @end_time
+    if not session_data['times'].nil?
+      times_data = session_data['times'].split(',')
+      @times_count += times_data.size
+      times_data.each do |timevalue|
+        @times_sum += timevalue.to_f
+      end
+    end
+  end
+end
+
+def average_time
+  @times_count > 0 ? @times_sum/@times_count : 0.0
+end
+
+def save_results
+  return if Bench.result_filename.nil?
+  
+  res_hash = YAML.load_file(Bench.result_filename) if File.exist?(Bench.result_filename)
+  res_hash ||= {}
+  puts "Overall results are : startTime (#{@start_time.to_s}), endTime (#{@end_time.to_s}), count (#{@total_count.to_s}), payload (#{Bench.datasize}), concurrency (#{Bench.concurrency})"
+  res_hash[Bench.concurrency.to_s] = (@end_time > 0.0 and @start_time > 0.0) ? [@total_count/(@end_time - @start_time)] : [0.0]
+  res_hash[Bench.concurrency.to_s] << average_time
+  File.open(Bench.result_filename, 'w' ) do |file|
+    file.write res_hash.to_yaml unless res_hash.empty?
+  end
+end
+
+# 1) Extract Bench title and key
+sync_key = ARGV[0]
+
+# 2) Simulate the payload
+Bench.datasize = ARGV[1].to_i
+@expected = Bench.get_test_data(Bench.datasize)
+Bench.concurrency = ARGV[2].to_i
+
+# 3) extract result filename
+Bench.result_filename = ARGV[3] unless ARGV[3].nil?
+
+# 4) Extract server name
+server = ARGV[4] unless ARGV[4].nil?
+server ||= 'default'
+if server != 'default'
+  Bench.base_url = server
+end
+
+# 5) Set up the server
+Bench.admin_login = 'rhoadmin'
+Bench.admin_password = ''
+Bench.get_test_server
+Bench.reset_app
+Bench.user_name = "benchuser"
+Bench.password = "password"
+Bench.set_server_state("test_db_storage:application:#{Bench.user_name}",@expected)
+Bench.reset_refresh_time('MockAdapter')
+
+#6) set the sync key
+@start_time = Time.now + 5.0
+Bench.set_server_state(sync_key, @start_time.to_f.to_s)
+puts "Sync Key #{sync_key} is set to #{@start_time} - Please, start the clients now!!!"
+
+#7) wait until all distributed clients are finished
+while true
+  sleep(1)
+  stats_data = Bench.get_server_state("bench_statistics_data")
+  if (not stats_data.nil?) and stats_data.size == Bench.concurrency
+    break
+  end
+  puts " Waiting for the clients to finish : #{Bench.concurrency - stats_data.size} out of #{Bench.concurrency}"
+end
+
+# 8) Now, save all data to the disk
+begin 
+  sleep(1)
+  @total_count = 0
+  @start_time = 0.0
+  @end_time = 0.0
+  @times_sum = 0.0
+  @times_count = 0
+  process_results
+  save_results
+rescue Exception => e
+  puts e
+end
+
+#8) Clean-up the db
+Bench.reset_app

data/bench/distr_bench/run_distr_client.sh

@@ -0,0 +1,12 @@
+#! /bin/sh
+test_label=$1
+server=$2
+n_iterations=$3
+payload=$4
+
+RACK_ENV=production
+export RACK_ENV
+
+sync_key="${test_label}_$payload"
+n_threads=1
+ruby distr_bench start '../scripts/test_query_script.rb' 'rhoadmin' '' $server $sync_key $n_threads $n_iterations $payload

data/bench/distr_bench/run_test_query_script.sh

@@ -0,0 +1,50 @@
+#! /bin/sh
+
+timestamp_postfix=$(date +%Y_%m_%d_%H%M%S)
+test_label=query_bench_$timestamp_postfix
+
+if [ $# -gt 0 ] ; then
+    test_label=$1
+fi
+server='default'
+if [ $# -gt 1 ] ; then
+    server=$2
+fi
+
+clients[0]=ec2-50-17-151-136.compute-1.amazonaws.com
+clients[1]=ec2-107-22-43-25.compute-1.amazonaws.com
+clients[2]=ec2-75-101-174-0.compute-1.amazonaws.com
+clients[3]=ec2-50-16-87-55.compute-1.amazonaws.com
+clients[4]=ec2-107-22-48-222.compute-1.amazonaws.com
+clients[5]=ec2-107-22-61-93.compute-1.amazonaws.com
+clients[6]=ec2-107-22-53-145.compute-1.amazonaws.com
+clients[7]=ec2-50-17-152-123.compute-1.amazonaws.com
+clients[8]=ec2-50-17-155-181.compute-1.amazonaws.com
+clients[9]=ec2-75-101-225-80.compute-1.amazonaws.com
+
+n_iterations=100
+current_path=`pwd`
+
+# setup the benchmark directory structure
+ruby ../prepare_bench "$test_label" query_bench_$timestamp_postfix "1 2 3 5 10"
+
+# simulate variaous number of data records
+for n_clients in 1 2 3 5 10
+do
+	for payload in 1 5 10 50 100 250 500
+	do
+		result_filename=./bench_results/query_bench_$timestamp_postfix/raw_data/query_bench_result.$payload
+		sync_key=sync_${timestamp_postfix}
+		for ((  i = 0 ;  i < $n_clients;  i++  ))
+		do
+			ssh -i /tmp/EC2-inst.pem -o "UserKnownHostsFile /dev/null" -o "StrictHostKeyChecking no" ec2-user@${clients[$i]} "cd /opt/rhoconnect/bench/distr_bench; ./run_distr_client.sh $sync_key $server $n_iterations $payload 1>/dev/null" &
+		done
+	
+		# start main script
+		ruby distr_bench_main ${sync_key}_$payload $payload $n_clients $result_filename $server
+		sleep 5
+	done
+done
+
+# once benchmark is finished - process the results
+ruby ../lib/bench/bench_result_processor.rb ./bench_results/query_bench_$timestamp_postfix/raw_data ./bench_results/query_bench_$timestamp_postfix/images