move Util module out of core; + some minor fixes in application and web.server
This commit is contained in:
parent
6da82d924b
commit
6051502e61
11 changed files with 34 additions and 18 deletions
|
|
@ -7,4 +7,14 @@ config :logger, :default_formatter,
|
||||||
colors: [enabled: false],
|
colors: [enabled: false],
|
||||||
metadata: [:mfa, :pid]
|
metadata: [:mfa, :pid]
|
||||||
|
|
||||||
|
config :scopes, Scopes.Web.Server.Endpoint,
|
||||||
|
url: [host: "localhost"],
|
||||||
|
adapter: Bandit.PhoenixAdapter,
|
||||||
|
render_errors: [
|
||||||
|
formats: [json: ScopesApiWeb.ErrorJSON],
|
||||||
|
layout: false
|
||||||
|
],
|
||||||
|
#pubsub_server: Scopes.Web.Server.PubSub,
|
||||||
|
live_view: [signing_salt: "3Jtdea8i"]
|
||||||
|
|
||||||
import_config "#{config_env()}.exs"
|
import_config "#{config_env()}.exs"
|
||||||
|
|
|
||||||
|
|
@ -23,4 +23,3 @@ config :scopes, Scopes.Web.Server.Endpoint,
|
||||||
check_origin: false,
|
check_origin: false,
|
||||||
code_reloader: true,
|
code_reloader: true,
|
||||||
debug_errors: true
|
debug_errors: true
|
||||||
|
|
||||||
|
|
|
||||||
4
config/runtime.exs
Normal file
4
config/runtime.exs
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
import Config
|
||||||
|
|
||||||
|
config :scopes, Scopes.Web.Server.Endpoint, server: true
|
||||||
|
|
||||||
|
|
@ -5,7 +5,7 @@ defmodule Scopes.Application do
|
||||||
|
|
||||||
use Application
|
use Application
|
||||||
|
|
||||||
alias Scopes.Core.Util
|
alias Scopes.Util
|
||||||
|
|
||||||
require Logger
|
require Logger
|
||||||
require Util
|
require Util
|
||||||
|
|
@ -19,7 +19,7 @@ defmodule Scopes.Application do
|
||||||
#Scopes.Repo,
|
#Scopes.Repo,
|
||||||
#{DNSCluster, query:
|
#{DNSCluster, query:
|
||||||
# Application.get_env(:scopes, :dns_cluster_query) || :ignore},
|
# Application.get_env(:scopes, :dns_cluster_query) || :ignore},
|
||||||
#{Phoenix.PubSub, name: Scopes.PubSub},
|
{Phoenix.PubSub, name: Scopes.PubSub},
|
||||||
# Start a worker by calling: ScopesApi.Worker.start_link(arg)
|
# Start a worker by calling: ScopesApi.Worker.start_link(arg)
|
||||||
# {Scopes.Worker, arg},
|
# {Scopes.Worker, arg},
|
||||||
# Start to serve requests, typically the last entry
|
# Start to serve requests, typically the last entry
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
defmodule Scopes.Core do
|
defmodule Scopes.Core do
|
||||||
require Logger
|
|
||||||
require Scopes.Core.Util
|
|
||||||
|
|
||||||
alias Scopes.Core.Actor
|
alias Scopes.Core.Actor
|
||||||
alias Scopes.Core.Shape
|
alias Scopes.Core.Shape
|
||||||
alias Scopes.Core.Util
|
alias Scopes.Util
|
||||||
|
|
||||||
|
require Logger
|
||||||
|
require Util
|
||||||
|
|
||||||
def neuron(scope) do
|
def neuron(scope) do
|
||||||
#Logger.info(Util.show [scope])
|
#Logger.info(Util.show [scope])
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
defmodule Scopes.Core.Program do
|
defmodule Scopes.Core.Program do
|
||||||
require Logger
|
|
||||||
require Scopes.Core.Util
|
|
||||||
|
|
||||||
alias Scopes.Core
|
alias Scopes.Core
|
||||||
alias Scopes.Core.Environ
|
alias Scopes.Core.Environ
|
||||||
alias Scopes.Core.Shape
|
alias Scopes.Core.Shape
|
||||||
alias Scopes.Core.Util
|
alias Scopes.Util
|
||||||
|
|
||||||
|
require Logger
|
||||||
|
require Util
|
||||||
|
|
||||||
defmodule State do
|
defmodule State do
|
||||||
defstruct [:value, :count, :stage, :prog]
|
defstruct [:value, :count, :stage, :prog]
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
defmodule Scopes.Core.Util do
|
defmodule Scopes.Util do
|
||||||
defmacro show(fields) do
|
defmacro show(fields) do
|
||||||
names = for f <- fields do Macro.to_string(f) end
|
names = for f <- fields do Macro.to_string(f) end
|
||||||
quote bind_quoted: [names: names, fields: fields] do
|
quote bind_quoted: [names: names, fields: fields] do
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
defmodule Scopes.Web.Server.Endpoint do
|
defmodule Scopes.Web.Server.Endpoint do
|
||||||
use Phoenix.Endpoint, otp_app: :scopes
|
use Phoenix.Endpoint, otp_app: :scopes
|
||||||
|
|
||||||
|
plug Plug.RequestId
|
||||||
|
|
||||||
plug Scopes.Web.Server.Router
|
plug Scopes.Web.Server.Router
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -24,9 +24,10 @@ end
|
||||||
|
|
||||||
defmodule Scopes.Web.Server.JSON do
|
defmodule Scopes.Web.Server.JSON do
|
||||||
require Logger
|
require Logger
|
||||||
require Scopes.Core.Util
|
require Scopes.Util
|
||||||
|
|
||||||
def index(%{message: text}) do
|
def index(%{message: text}) do
|
||||||
Logger.info(Scopes.Core.Util.show [text])
|
Logger.info(Scopes.Util.show [text])
|
||||||
text
|
text
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
defmodule Scopes.Demo.Application do
|
defmodule Scopes.Demo.Application do
|
||||||
use Application
|
use Application
|
||||||
|
|
||||||
alias Scopes.Core.Util
|
alias Scopes.Util
|
||||||
|
|
||||||
require Logger
|
require Logger
|
||||||
require Util
|
require Util
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
defmodule Scopes.CoreUtilTest do
|
defmodule Scopes.UtilTest do
|
||||||
use ExUnit.Case, async: true
|
use ExUnit.Case, async: true
|
||||||
|
|
||||||
alias Scopes.Core.Util
|
alias Scopes.Util
|
||||||
require Scopes.Core.Util
|
require Util
|
||||||
|
|
||||||
describe "info:" do
|
describe "info:" do
|
||||||
test "fields" do
|
test "fields" do
|
||||||
Loading…
Add table
Reference in a new issue