merge conflict resolved

frameworks/Elixir/phoenix/config/prod.exs

@@ -11,7 +11,7 @@ config :hello, Hello.Repo,
   username: "benchmarkdbuser",
   password: "benchmarkdbpass",
   database: "hello_world",
-  hostname: "localhost",
+  hostname: "192.168.56.101",
   pool_size: 256
 
 # ## SSL Support
@@ -28,9 +28,7 @@ config :hello, Hello.Repo,
 # Where those two env variables point to a file on
 # disk for the key and cert.
 
-
-# Do not pring debug messages in production
-config :logger, level: :info
+config :logger, level: :error
 
 # ## Using releases
 #

frameworks/Elixir/phoenix/web/controllers/page_controller.ex

@@ -3,6 +3,8 @@ defmodule Hello.PageController do
   alias Hello.World
   alias Hello.Fortune
 
+  plug :action
+
   def index(conn, _params) do
     json conn, %{"TE Benchmarks\n" => "Started"}
   end

frameworks/Elixir/phoenix/web/router.ex

@@ -1,21 +1,7 @@
 defmodule Hello.Router do
   use Hello.Web, :router
 
-  #pipeline :browser do
-  #  plug :accepts, ["html"]
-  #  plug :fetch_session
-  #  plug :fetch_flash
-  #  plug :protect_from_forgery
-  #  plug :put_secure_browser_headers
-  #end
-
-  pipeline :api do
-    plug :accepts, ["json"]
-  end
-
   scope "/", Hello do
-    pipe_through :api # Use the default browser stack
-
     get "/json", PageController, :_json
     get "/db", PageController, :db
     get "/queries", PageController, :queries
@@ -24,9 +10,4 @@ defmodule Hello.Router do
     get "/plaintext", PageController, :plaintext
     get "/", PageController, :index
   end
-
-  # Other scopes may use custom stacks.
-  # scope "/api", Hello do
-  #   pipe_through :api
-  # end
 end