Browse Source

update moonshine crystal redis

Keenan Brock 9 years ago
parent
commit
ab0096a3b9

+ 5 - 5
frameworks/Crystal/moonshine/benchmark_config.json

@@ -2,12 +2,12 @@
   "framework": "moonshine",
   "tests": [{
     "default": {
-      "setup_file": "setup",
+      "setup_file": "setup-redis",
       "json_url": "/json",
-      "db_url": "/redis/db",
-      "query_url": "/redis/queries?queries=",
-      "fortune_url": "/redis/fortunes",
-      "update_url": "/redis/updates?queries=",
+      "db_url": "/db",
+      "query_url": "/queries?queries=",
+      "fortune_url": "/fortunes",
+      "update_url": "/updates?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",

+ 15 - 10
frameworks/Crystal/moonshine/server.cr → frameworks/Crystal/moonshine/server-redis.cr

@@ -39,6 +39,15 @@ private def setWorld(world)
   world
 end
 
+private def fortunes
+  data = [] of  Hash(Symbol, (String | Int32))
+
+  REDIS.lrange("fortunes", 0, -1).each_with_index do |e, i|
+    data.push({:id => i + 1, :message => e.to_s})
+  end
+  data
+end
+
 private def sanitizedQueryCount(request)
   begin
     queries = request.get["queries"].to_i
@@ -73,14 +82,14 @@ end
 #
 
 # Redis Test 2: Single database query
-app.get "/redis/db", do |request|
+app.get "/db", do |request|
   res = ok(randomWorld.to_json)
   res.headers["Content-type"] = CONTENT::JSON
   res
 end
 
 # Redis Test 3: Multiple database query
-app.get "/redis/queries", do |request|
+app.get "/queries", do |request|
   results = (1..sanitizedQueryCount(request)).map do
     randomWorld
   end
@@ -91,15 +100,11 @@ app.get "/redis/queries", do |request|
 end
 
 # Redis Test 4: Fortunes
-app.get "/redis/fortunes", do |request|
-  data = [] of  Hash(Symbol, (String | Int32))
-
-  REDIS.lrange("fortunes", 0, -1).each_with_index do |e, i|
-    data.push({ :id => i + 1, :message => e.to_s })
-  end
+app.get "/fortunes", do |request|
+  data = fortunes
   
   additional_fortune = {
-    :id => 0
+    :id => 0,
     :message => "Additional fortune added at request time."
   }
   data.push(additional_fortune)
@@ -139,7 +144,7 @@ app.get "/redis/fortunes", do |request|
 end
 
 # Redis Test 5: Database Updates
-app.get "/redis/updates", do |request|
+app.get "/updates", do |request|
   updated = (1..sanitizedQueryCount(request)).map do
     world = randomWorld
     world[:randomNumber] = rand(1..ID_MAXIMUM)

+ 1 - 1
frameworks/Crystal/moonshine/setup.sh → frameworks/Crystal/moonshine/setup-redis.sh

@@ -4,4 +4,4 @@ fw_depends crystal
 
 crystal deps install
 
-crystal server.cr &
+crystal server-redis.cr &