renamed framework name to ngx_mruby

frameworks/Ruby/nginx_mruby/bash_profile.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# We assume single-user installation as
-# done in our rvm.sh script and
-# in Travis-CI
-source $HOME/.rvm/scripts/rvm

frameworks/Ruby/nginx_mruby/fortune.rb

@@ -1,15 +0,0 @@
-r = Nginx::Request.new
-
-# https://github.com/mattn/mruby-mysql/blob/master/example/example.rb
-db = Userdata.new("my_#{Process.pid}").db
-
-fortunes = []
-db.execute("select * from Fortune") do |row, fields|
-  fortunes << Hash[fields.zip(row)]
-end
-fortunes << { "id" => 0, "message" => "Additional fortune added at request time." }
-
-fortunes = fortunes.sort_by { |x| x.message }
-
-#TODO: use "erb" to render template
-Nginx.rputs JSON::stringify(fortunes)

frameworks/Ruby/nginx_mruby/setup.py

@@ -1,16 +0,0 @@
-import subprocess
-#import sys
-import setup_util
-#import os
-
-def start(args, logfile, errfile):
-  setup_util.replace_text("nginx_mruby/nginx.conf", "CWD", args.troot)
-  setup_util.replace_text("nginx_mruby/nginx.conf", "DBHOSTNAME", args.database_host)
-  subprocess.Popen('sudo /usr/local/nginx_mruby/sbin/nginx -c $TROOT/nginx.conf -g "worker_processes ' + str((args.max_threads)) + ';"', shell=True, cwd="nginx_mruby", stderr=errfile, stdout=logfile)
-
-  return 0
-
-def stop(logfile, errfile):
-  subprocess.Popen('sudo /usr/local/nginx_mruby/sbin/nginx -c $TROOT/nginx.conf -s stop', shell=True, cwd="nginx_mruby", stderr=errfile, stdout=logfile)
-
-  return 0

frameworks/Ruby/nginx_mruby/source_code

@@ -1,4 +0,0 @@
-./nginx_mruby/db.rb
-./nginx_mruby/fortune.rb
-./nginx_mruby/queries.rb
-./nginx_mruby/updates.rb

frameworks/Ruby/nginx_mruby/README.md → frameworks/Ruby/ngx_mruby/README.md

@@ -1,8 +1,8 @@
 # [nginx + mruby](https://github.com/matsumoto-r/ngx_mruby) Benchmark Test
 
-The nginx app is inside [app.rb](app.rb)
+The nginx app is distributes across a few files. most of it is in [nginx.conf](nginx.conf)
 The nginx conf is inside [nginx.conf](nginx.conf)
-Requires a nginx compiled with ngx_mruby module
+Requires a nginx compiled with ngx_mruby module. It has been called nginx_mruby for lack of a better name
 
 
 ## Test URLs

frameworks/Ruby/ngx_mruby/bash_profile.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export MRUBY_HOME=${IROOT}/nginx_mruby
+#source $HOME/.rvm/scripts/rvm

frameworks/Ruby/nginx_mruby/benchmark_config → frameworks/Ruby/ngx_mruby/benchmark_config

@@ -1,5 +1,5 @@
 {
-  "framework": "nginx_mruby",
+  "framework": "ngx_mruby",
   "tests": [{
     "default": {
       "setup_file": "setup",
@@ -11,16 +11,16 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "MySQL",
-      "framework": "nginx_mruby",
+      "framework": "ngx_mruby",
       "language": "Ruby",
       "orm": "Raw",
-      "platform": "nginx_mruby",
+      "platform": "ngx_mruby",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "nginx_mruby",
+      "display_name": "ngx_mruby",
       "notes": "",
-      "versus": "nginx_mruby"
+      "versus": "ngx_mruby"
     }
   }]
 }

frameworks/Ruby/nginx_mruby/nginx.conf → frameworks/Ruby/ngx_mruby/nginx.conf

@@ -46,22 +46,5 @@ http {
 #            #note: next line has cwd
 #            mruby_content_handler 'CWD/fortunes.rb' cache;
 #        }
-
-        #location ~ \.rb$ {
-        #    default_type "application/json";
-        #    mruby_add_handler on;
-        #}
-
-        #error_page  404              /404.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;
-        #}
     }
 }

frameworks/Ruby/nginx_mruby/queries.rb → frameworks/Ruby/ngx_mruby/queries.rb

@@ -1,10 +1,3 @@
-r = Nginx::Request.new
-
-num_queries = r.var.arg_queries.to_i
-num_queries = 1 if num_queries < 0
-num_queries = 500 if num_queries > 500
-
-# https://github.com/mattn/mruby-mysql/blob/master/example/example.rb
 class World
   def db
     @db ||= Userdata.new("my_#{Process.pid}").db
@@ -23,6 +16,12 @@ class World
   end
 end
 
+r = Nginx::Request.new
+
+num_queries = r.var.arg_queries.to_i
+num_queries = 1 if num_queries < 0
+num_queries = 500 if num_queries > 500
+
 world = World.new
 ret = num_queries.times.map { world.find(rand(10000)) }
 Nginx.rputs JSON::stringify(ret)

frameworks/Ruby/ngx_mruby/setup.py

@@ -0,0 +1,11 @@
+import subprocess
+
+def start(args, logfile, errfile):
+  subprocess.Popen('sudo /usr/local/nginx_mruby/sbin/nginx -c $TROOT/nginx.conf -g "worker_processes ' + str((args.max_threads)) + ';"', shell=True, cwd="ngx_mruby", stderr=errfile, stdout=logfile)
+
+  return 0
+
+def stop(logfile, errfile):
+  subprocess.Popen('sudo /usr/local/nginx_mruby/sbin/nginx -c $TROOT/nginx.conf -s stop', shell=True, cwd="ngx_mruby", stderr=errfile, stdout=logfile)
+
+  return 0

frameworks/Ruby/ngx_mruby/source_code

@@ -0,0 +1,4 @@
+./ngx_mruby/db.rb
+./ngx_mruby/fortune.rb
+./ngx_mruby/queries.rb
+./ngx_mruby/updates.rb

toolset/setup/linux/webservers/nginx_mruby.sh

@@ -2,7 +2,7 @@
 
 PREFIX=/usr/local/nginx_mruby
 
-RETCODE=$(fw_exists nginx_mruby.installed)
+RETCODE=$(fw_exists ${IROOT}/nginx_mruby.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
 sudo apt-get install -y libhiredis-dev
@@ -18,14 +18,14 @@ cd ngx_mruby
 git submodule init
 git submodule update
 
-RETCODE=$(fw_exists mruby/mrbgems/mruby-mysql)
-if [ "$RETCODE" != 0 ] ; then
-  git clone [email protected]:mattn/mruby-mysql.git mruby/mrbgems/mruby-mysql
-  # cd mruby/mrbgems
-  # git clone [email protected]:mattn/mruby-mysql.git mruby/mrbgems/m
-  # cd ../..
-fi
+# RETCODE=$(fw_exists mruby/mrbgems/mruby-mysql)
+# if [ "$RETCODE" != 0 ] ; then
+#   git clone [email protected]:mattn/mruby-mysql.git mruby/mrbgems/mruby-mysql
+#   # cd mruby/mrbgems
+#   # git clone [email protected]:mattn/mruby-mysql.git mruby/mrbgems/m
+#   # cd ../..
+# fi
 
 NGINX_CONFIG_OPT_ENV="--prefix=${PREFIX} --with-http_stub_status_module" sh build.sh
 
-touch $IROOT/nginx_mruby.installed
+touch ${IROOT}/nginx_mruby.installed