Skip to content

Commit

Permalink
Add and use mix formater (#94)
Browse files Browse the repository at this point in the history
  • Loading branch information
rslota committed Nov 21, 2019
1 parent 0a23ef6 commit 74a10de
Show file tree
Hide file tree
Showing 30 changed files with 770 additions and 582 deletions.
4 changes: 1 addition & 3 deletions .credo.exs
Expand Up @@ -71,7 +71,6 @@
# set this value to 0 (zero).
{Credo.Check.Design.TagTODO, exit_status: 2},
{Credo.Check.Design.TagFIXME},

{Credo.Check.Readability.FunctionNames},
{Credo.Check.Readability.LargeNumbers},
{Credo.Check.Readability.MaxLineLength, priority: :low, max_length: 100},
Expand Down Expand Up @@ -102,7 +101,6 @@
{Credo.Check.Refactor.PipeChainStart},
{Credo.Check.Refactor.UnlessWithElse},
{Credo.Check.Refactor.VariableRebinding},

{Credo.Check.Warning.BoolOperationOnSameValues},
{Credo.Check.Warning.IExPry},
{Credo.Check.Warning.IoInspect},
Expand All @@ -119,7 +117,7 @@
{Credo.Check.Warning.UnusedPathOperation},
{Credo.Check.Warning.UnusedRegexOperation},
{Credo.Check.Warning.UnusedStringOperation},
{Credo.Check.Warning.UnusedTupleOperation},
{Credo.Check.Warning.UnusedTupleOperation}

# Custom checks can be created using `mix credo.gen.check`.
#
Expand Down
3 changes: 3 additions & 0 deletions .formatter.exs
@@ -0,0 +1,3 @@
[
inputs: ["*.{ex,exs}", "{config,lib,test}/**/*.{ex,exs}"]
]
19 changes: 16 additions & 3 deletions config/config.exs
Expand Up @@ -29,7 +29,20 @@ config :plug, :statuses, %{
460 => "Invalid device token"
}

lager_formater_config = [:date, 'T', :time, :color, ' [', :severity, '] ', :pid, ' ', :message, '\e[0m\r\n']
lager_formater_config = [
:date,
'T',
:time,
:color,
' [',
:severity,
'] ',
:pid,
' ',
:message,
'\e[0m\r\n'
]

config :lager,
colored: false,
handlers: [
Expand All @@ -49,10 +62,10 @@ config :lager,
level: :info,
formatter: :lager_default_formatter,
formatter_config: lager_formater_config
]
]
]

import_config "#{Mix.env}.exs"
import_config "#{Mix.env()}.exs"

# Globally disable maru's "test mode". If we don't disable it explicitly
# it will crash a release.
Expand Down
74 changes: 39 additions & 35 deletions config/dev.exs
@@ -1,47 +1,51 @@
use Mix.Config

config :exometer_core, report: [reporters: [{:exometer_report_tty, []}]]
config :elixometer, reporter: :exometer_report_tty,
env: Mix.env,
metric_prefix: "mongoose_push"

config :elixometer,
reporter: :exometer_report_tty,
env: Mix.env(),
metric_prefix: "mongoose_push"

config :mongoose_push, loglevel: :debug

config :maru, MongoosePush.Router,
versioning: [
using: :path
],
https: [
bind_addr: "127.0.0.1",
port: 8443,
keyfile: "priv/ssl/fake_key.pem",
certfile: "priv/ssl/fake_cert.pem",
otp_app: :mongoose_push
]
versioning: [
using: :path
],
https: [
bind_addr: "127.0.0.1",
port: 8443,
keyfile: "priv/ssl/fake_key.pem",
certfile: "priv/ssl/fake_cert.pem",
otp_app: :mongoose_push
]

config :mongoose_push, fcm: [
config :mongoose_push,
fcm: [
default: [
endpoint: "localhost",
key: "fake_app_key",
pool_size: 5,
mode: :prod
endpoint: "localhost",
key: "fake_app_key",
pool_size: 5,
mode: :prod
]
]

config :mongoose_push, apns: [
dev: [
endpoint: "localhost",
cert: "priv/apns/dev_cert.pem",
key: "priv/apns/dev_key.pem",
mode: :dev,
use_2197: true,
pool_size: 5
],
prod: [
cert: "priv/apns/prod_cert.pem",
key: "priv/apns/prod_key.pem",
mode: :prod,
use_2197: false,
pool_size: 5
]
]
config :mongoose_push,
apns: [
dev: [
endpoint: "localhost",
cert: "priv/apns/dev_cert.pem",
key: "priv/apns/dev_key.pem",
mode: :dev,
use_2197: true,
pool_size: 5
],
prod: [
cert: "priv/apns/prod_cert.pem",
key: "priv/apns/prod_key.pem",
mode: :prod,
use_2197: false,
pool_size: 5
]
]
85 changes: 42 additions & 43 deletions config/prod.exs
Expand Up @@ -3,52 +3,51 @@ use Mix.Config
config :mix_docker, image: "mongoose_push"

config :maru, MongoosePush.Router,
versioning: [
using: :path
],
https: [
bind_addr: {:system, :string, "PUSH_HTTPS_BIND_ADDR", "127.0.0.1"},
port: {:system, :integer, "PUSH_HTTPS_PORT", 8443},
keyfile: {:system, :string, "PUSH_HTTPS_KEYFILE", "priv/ssl/fake_key.pem"},
certfile: {:system, :string, "PUSH_HTTPS_CERTFILE", "priv/ssl/fake_cert.pem"},
acceptors: {:system, :integer, "PUSH_HTTPS_ACCEPTORS", 100},
otp_app: :mongoose_push
]
versioning: [
using: :path
],
https: [
bind_addr: {:system, :string, "PUSH_HTTPS_BIND_ADDR", "127.0.0.1"},
port: {:system, :integer, "PUSH_HTTPS_PORT", 8443},
keyfile: {:system, :string, "PUSH_HTTPS_KEYFILE", "priv/ssl/fake_key.pem"},
certfile: {:system, :string, "PUSH_HTTPS_CERTFILE", "priv/ssl/fake_cert.pem"},
acceptors: {:system, :integer, "PUSH_HTTPS_ACCEPTORS", 100},
otp_app: :mongoose_push
]

config :mongoose_push, loglevel:
{:system, :atom, "PUSH_LOGLEVEL", :info}
config :mongoose_push, fcm_enabled:
{:system, :boolean, "PUSH_FCM_ENABLED", true}
config :mongoose_push, loglevel: {:system, :atom, "PUSH_LOGLEVEL", :info}
config :mongoose_push, fcm_enabled: {:system, :boolean, "PUSH_FCM_ENABLED", true}

config :mongoose_push, apns_enabled:
{:system, :boolean, "PUSH_APNS_ENABLED", true}
config :mongoose_push, apns_enabled: {:system, :boolean, "PUSH_APNS_ENABLED", true}

config :mongoose_push, fcm: [
default: [
endpoint: {:system, :string, "PUSH_FCM_ENDPOINT", nil},
key: {:system, :string, "PUSH_FCM_APP_KEY", "fake_app_key"},
pool_size: {:system, :integer, "PUSH_FCM_POOL_SIZE", 5},
mode: :prod,
config :mongoose_push,
fcm: [
default: [
endpoint: {:system, :string, "PUSH_FCM_ENDPOINT", nil},
key: {:system, :string, "PUSH_FCM_APP_KEY", "fake_app_key"},
pool_size: {:system, :integer, "PUSH_FCM_POOL_SIZE", 5},
mode: :prod
]
]
]

config :mongoose_push, apns: [
dev: [
endpoint: {:system, :string, "PUSH_APNS_DEV_ENDPOINT", nil},
cert: {:system, :string, "PUSH_APNS_DEV_CERT", "priv/apns/dev_cert.pem"},
key: {:system, :string, "PUSH_APNS_DEV_KEY", "priv/apns/dev_key.pem"},
mode: :dev,
use_2197: {:system, :boolean, "PUSH_APNS_DEV_USE_2197", false},
pool_size: {:system, :integer, "PUSH_APNS_DEV_POOL_SIZE", 5},
default_topic: {:system, :string, "PUSH_APNS_DEV_DEFAULT_TOPIC", nil}
],
prod: [
endpoint: {:system, :string, "PUSH_APNS_PROD_ENDPOINT", nil},
cert: {:system, :string, "PUSH_APNS_PROD_CERT", "priv/apns/prod_cert.pem"},
key: {:system, :string, "PUSH_APNS_PROD_KEY", "priv/apns/prod_key.pem"},
mode: :prod,
use_2197: {:system, :boolean, "PUSH_APNS_PROD_USE_2197", false},
pool_size: {:system, :integer, "PUSH_APNS_PROD_POOL_SIZE", 5},
default_topic: {:system, :string, "PUSH_APNS_PROD_DEFAULT_TOPIC", nil}
config :mongoose_push,
apns: [
dev: [
endpoint: {:system, :string, "PUSH_APNS_DEV_ENDPOINT", nil},
cert: {:system, :string, "PUSH_APNS_DEV_CERT", "priv/apns/dev_cert.pem"},
key: {:system, :string, "PUSH_APNS_DEV_KEY", "priv/apns/dev_key.pem"},
mode: :dev,
use_2197: {:system, :boolean, "PUSH_APNS_DEV_USE_2197", false},
pool_size: {:system, :integer, "PUSH_APNS_DEV_POOL_SIZE", 5},
default_topic: {:system, :string, "PUSH_APNS_DEV_DEFAULT_TOPIC", nil}
],
prod: [
endpoint: {:system, :string, "PUSH_APNS_PROD_ENDPOINT", nil},
cert: {:system, :string, "PUSH_APNS_PROD_CERT", "priv/apns/prod_cert.pem"},
key: {:system, :string, "PUSH_APNS_PROD_KEY", "priv/apns/prod_key.pem"},
mode: :prod,
use_2197: {:system, :boolean, "PUSH_APNS_PROD_USE_2197", false},
pool_size: {:system, :integer, "PUSH_APNS_PROD_POOL_SIZE", 5},
default_topic: {:system, :string, "PUSH_APNS_PROD_DEFAULT_TOPIC", nil}
]
]
]
109 changes: 56 additions & 53 deletions config/test.exs
Expand Up @@ -2,63 +2,66 @@ use Mix.Config

config :mongoose_push, loglevel: :debug

config :elixometer, reporter: :exometer_report_tty,
env: Mix.env,
metric_prefix: "mongoose_push"
config :elixometer,
reporter: :exometer_report_tty,
env: Mix.env(),
metric_prefix: "mongoose_push"

config :maru, MongoosePush.Router,
versioning: [
using: :path
],
https: [
bind_addr: "0.0.0.0",
port: 8443,
keyfile: "priv/ssl/fake_key.pem",
certfile: "priv/ssl/fake_cert.pem",
otp_app: :mongoose_push
]
versioning: [
using: :path
],
https: [
bind_addr: "0.0.0.0",
port: 8443,
keyfile: "priv/ssl/fake_key.pem",
certfile: "priv/ssl/fake_cert.pem",
otp_app: :mongoose_push
]

config :mongoose_push, fcm: [
config :mongoose_push,
fcm: [
default: [
key: "fake_app_key",
endpoint: "localhost",
pool_size: 5,
mode: :prod
key: "fake_app_key",
endpoint: "localhost",
pool_size: 5,
mode: :prod
]
]

config :mongoose_push, apns: [
dev1: [
endpoint: "localhost",
cert: "priv/apns/dev_cert.pem",
key: "priv/apns/dev_key.pem",
mode: :dev,
use_2197: true,
pool_size: 1,
default_topic: "dev_topic"
],
prod1: [
endpoint: "localhost",
cert: "priv/apns/prod_cert.pem",
key: "priv/apns/prod_key.pem",
use_2197: true,
pool_size: 2,
default_topic: "prod1_override_topic"
],
dev2: [
endpoint: "localhost",
cert: "priv/apns/dev_cert.pem",
key: "priv/apns/dev_key.pem",
mode: :dev,
use_2197: true,
pool_size: 3
],
prod2: [
endpoint: "localhost",
cert: "priv/apns/prod_cert.pem",
key: "priv/apns/prod_key.pem",
mode: :prod,
use_2197: true,
pool_size: 4
]
]
config :mongoose_push,
apns: [
dev1: [
endpoint: "localhost",
cert: "priv/apns/dev_cert.pem",
key: "priv/apns/dev_key.pem",
mode: :dev,
use_2197: true,
pool_size: 1,
default_topic: "dev_topic"
],
prod1: [
endpoint: "localhost",
cert: "priv/apns/prod_cert.pem",
key: "priv/apns/prod_key.pem",
use_2197: true,
pool_size: 2,
default_topic: "prod1_override_topic"
],
dev2: [
endpoint: "localhost",
cert: "priv/apns/dev_cert.pem",
key: "priv/apns/dev_key.pem",
mode: :dev,
use_2197: true,
pool_size: 3
],
prod2: [
endpoint: "localhost",
cert: "priv/apns/prod_cert.pem",
key: "priv/apns/prod_key.pem",
mode: :prod,
use_2197: true,
pool_size: 4
]
]

0 comments on commit 74a10de

Please sign in to comment.