Browse Source

Lapis: split /db and /queries into different handlers

Tor Hveem 10 years ago
parent
commit
0ee1591364

+ 1 - 1
frameworks/Lua/lapis/benchmark_config

@@ -5,7 +5,7 @@
       "setup_file": "setup",
       "setup_file": "setup",
       "json_url": "/",
       "json_url": "/",
       "db_url": "/db",
       "db_url": "/db",
-      "query_url": "/db?queries=",
+      "query_url": "/queries?queries=",
       "fortune_url": "/fortunes",
       "fortune_url": "/fortunes",
       "update_url": "/update?queries=",
       "update_url": "/update?queries=",
       "plaintext_url": "/plaintext",
       "plaintext_url": "/plaintext",

+ 9 - 0
frameworks/Lua/lapis/web.lua

@@ -105,6 +105,15 @@ do
       }
       }
     end,
     end,
     ["/db"] = function(self)
     ["/db"] = function(self)
+      local w = World:find(random(1, 10000))
+      return {
+        json = {
+          id = w.id,
+          randomNumber = w.randomnumber
+        }
+      }
+    end,
+    ["/queries"] = function(self)
       local num_queries = tonumber(self.params.queries) or 1
       local num_queries = tonumber(self.params.queries) or 1
       if num_queries < 2 then
       if num_queries < 2 then
         local w = World:find(random(1, 10000))
         local w = World:find(random(1, 10000))

+ 4 - 0
frameworks/Lua/lapis/web.moon

@@ -15,6 +15,10 @@ class Benchmark extends lapis.Application
     json: {message: "Hello, World!"}
     json: {message: "Hello, World!"}
 
 
   "/db": =>
   "/db": =>
+      w = World\find random(1, 10000)
+      return json: {id:w.id,randomNumber:w.randomnumber}
+
+  "/queries": =>
     num_queries = tonumber(@params.queries) or 1
     num_queries = tonumber(@params.queries) or 1
     if num_queries < 2 
     if num_queries < 2 
       w = World\find random(1, 10000)
       w = World\find random(1, 10000)