Selaa lähdekoodia

Merge pull request #1966 from utkarshkukreti/elixir-fixes

Elixir fixes
Mike Smith 9 vuotta sitten
vanhempi
commit
8c055b5317

+ 0 - 6
frameworks/Elixir/cowboy/config/config.exs

@@ -1,7 +1 @@
 use Mix.Config
-
-config :mysql,
-  username: "benchmarkdbuser",
-  password: "benchmarkdbpass",
-  database: "hello_world",
-  hostname: "localhost"

+ 18 - 26
frameworks/Elixir/cowboy/lib/hello.ex

@@ -1,19 +1,13 @@
 defmodule Hello do
-
   def start(_type, _args) do
     dispatch = :cowboy_router.compile([
-
-      { :_,
-        [
-          {"/json", JsonHandler, []},
-          {"/plaintext", PlaintextHandler, []}
-      ]}
+      {:_, [{"/json", JsonHandler, []},
+            {"/plaintext", PlaintextHandler, []}]}
     ])
-    { :ok, _ } = :cowboy.start_http(:http,
-                                    5000,
-                                   [{:port, 8080}],
-                                   [{ :env, [{:dispatch, dispatch}]}]
-                                   )
+    {:ok, _} = :cowboy.start_http(:http,
+                                  5000,
+                                  [port: 8080],
+                                  [env: [dispatch: dispatch]])
   end
 end
 
@@ -23,15 +17,14 @@ defmodule JsonHandler do
   end
 
   def handle(request, state) do
-    Poison.encode!(%{message: "Hello, World!"})
-    { :ok, reply } = :cowboy_req.reply(200,
-      [{"content-type", "application/json"}],
-      Poison.encode!(%{:message => "Hello, World!"}),
-      request)
-    { :ok, reply, state }
+    {:ok, reply} = :cowboy_req.reply(200,
+                                     [{"content-type", "application/json"}],
+                                     Poison.encode!(%{message: "Hello, World!"}),
+                                     request)
+    {:ok, reply, state}
   end
 
-  def terminate(reason, request, state) do
+  def terminate(_reason, _request, _state) do
     :ok
   end
 end
@@ -42,15 +35,14 @@ defmodule PlaintextHandler do
   end
 
   def handle(request, state) do
-    Poison.encode!(%{message: "Hello, World!"})
-    { :ok, reply } = :cowboy_req.reply(200,
-      [{"content-type", "text/plain"}],
-      "Hello, World!",
-      request)
-    { :ok, reply, state }
+    {:ok, reply} = :cowboy_req.reply(200,
+                                     [{"content-type", "text/plain"}],
+                                     "Hello, World!",
+                                     request)
+    {:ok, reply, state}
   end
 
-  def terminate(reason, request, state) do
+  def terminate(_reason, _request, _state) do
     :ok
   end
 end

+ 1 - 1
frameworks/Elixir/phoenix/config/prod.exs

@@ -28,7 +28,7 @@ config :hello, Hello.Repo,
 # Where those two env variables point to a file on
 # disk for the key and cert.
 
-config :logger, level: :info
+config :logger, level: :error
 
 # ## Using releases
 #

+ 4 - 6
frameworks/Elixir/phoenix/web/controllers/page_controller.ex

@@ -3,8 +3,6 @@ defmodule Hello.PageController do
   alias Hello.World
   alias Hello.Fortune
 
-  plug :action
-
   def index(conn, _params) do
     json conn, %{"TE Benchmarks\n" => "Started"}
   end
@@ -18,9 +16,9 @@ defmodule Hello.PageController do
     json conn, Repo.get(World, :random.uniform(10000))
   end
 
-  def queries(conn, _params) do
+  def queries(conn, params) do
     q = try do
-      case String.to_integer(_params["queries"]) do
+      case String.to_integer(params["queries"]) do
         x when x < 1    -> 1
         x when x > 500  -> 500
         x               -> x
@@ -36,9 +34,9 @@ defmodule Hello.PageController do
     render conn, "fortunes.html", fortunes: Enum.sort(fortunes, fn f1, f2 -> f1.message < f2.message end)
   end
 
-  def updates(conn, _params) do
+  def updates(conn, params) do
     q = try do
-      case String.to_integer(_params["queries"]) do
+      case String.to_integer(params["queries"]) do
         x when x < 1    -> 1
         x when x > 500  -> 500
         x               -> x