diff options
| author | Logan Hunt <loganhunt@simponic.xyz> | 2023-01-24 12:35:27 -0700 |
|---|---|---|
| committer | Logan Hunt <logan.hunt@usu.edu> | 2023-01-24 12:43:08 -0700 |
| commit | ab5fc4a077eadcc3dfd28c3af89a762711a6b6b4 (patch) | |
| tree | 8f5100e54ce5be4b78e0a866871c67141082e89a | |
| parent | f8fd8fe39f33f35fef50094939657c86cc62427c (diff) | |
| download | chessh-ab5fc4a077eadcc3dfd28c3af89a762711a6b6b4.tar.gz chessh-ab5fc4a077eadcc3dfd28c3af89a762711a6b6b4.zip | |
Update elixir.yml
| -rw-r--r-- | .github/workflows/elixir.yml | 13 | ||||
| -rw-r--r-- | config/dev.exs | 7 | ||||
| -rw-r--r-- | config/runtime.exs | 30 | ||||
| -rw-r--r-- | config/test.exs | 7 |
4 files changed, 29 insertions, 28 deletions
diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml index 1bb6de9..95dc4c6 100644 --- a/.github/workflows/elixir.yml +++ b/.github/workflows/elixir.yml @@ -13,8 +13,6 @@ on: env: MIX_ENV: test NODE_ID: aUniqueString - REDIS_HOST: redis - REDIS_PORT: 6379 jobs: test: @@ -22,17 +20,6 @@ jobs: # use Postgres. This creates a database for running tests. # Additional services can be defined here if required. services: - # Label used to access the service container - redis: - # Docker Hub image - image: redis - # Set health checks to wait until redis has started - options: >- - --health-cmd "redis-cli ping" - --health-interval 10s - --health-timeout 5s - --health-retries 5 - db: image: postgres:14 ports: ['5432:5432'] diff --git a/config/dev.exs b/config/dev.exs index 88ee30b..f37da7b 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -5,3 +5,10 @@ config :chessh, Chessh.Repo, username: "postgres", password: "postgres", hostname: "localhost" + +config :hammer, + backend: [ + in_memory: + {Hammer.Backend.ETS, [expiry_ms: 60_000 * 60 * 4, cleanup_interval_ms: 60_000 * 10]}, + redis: {Hammer.Backend.ETS, [expiry_ms: 60_000 * 60 * 4, cleanup_interval_ms: 60_000 * 10]} + ] diff --git a/config/runtime.exs b/config/runtime.exs index f3cc03c..832dc95 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -1,20 +1,5 @@ import Config -config :hammer, - backend: [ - in_memory: - {Hammer.Backend.ETS, [expiry_ms: 60_000 * 60 * 4, cleanup_interval_ms: 60_000 * 10]}, - redis: - {Hammer.Backend.Redis, - [ - expiry_ms: 60_000 * 60 * 2, - redix_config: [ - host: System.get_env("REDIS_HOST", "localhost"), - port: String.to_integer(System.get_env("REDIS_PORT", "6379")) - ] - ]} - ] - config :chessh, port: String.to_integer(System.get_env("SSH_PORT", "42069")) @@ -43,4 +28,19 @@ if config_env() == :prod do url: database_url, pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10"), socket_options: maybe_ipv6 + + config :hammer, + backend: [ + in_memory: + {Hammer.Backend.ETS, [expiry_ms: 60_000 * 60 * 4, cleanup_interval_ms: 60_000 * 10]}, + redis: + {Hammer.Backend.Redis, + [ + expiry_ms: 60_000 * 60 * 2, + redix_config: [ + host: System.get_env("REDIS_HOST", "redis"), + port: String.to_integer(System.get_env("REDIS_PORT", "6379")) + ] + ]} + ] end diff --git a/config/test.exs b/config/test.exs index 3319f9b..60b42be 100644 --- a/config/test.exs +++ b/config/test.exs @@ -11,6 +11,13 @@ config :chessh, Chessh.Repo, hostname: "localhost", pool: Ecto.Adapters.SQL.Sandbox +config :hammer, + backend: [ + in_memory: + {Hammer.Backend.ETS, [expiry_ms: 60_000 * 60 * 4, cleanup_interval_ms: 60_000 * 10]}, + redis: {Hammer.Backend.ETS, [expiry_ms: 60_000 * 60 * 4, cleanup_interval_ms: 60_000 * 10]} + ] + config :chessh, port: 34_355, key_dir: Path.join(Path.dirname(__DIR__), "priv/test_keys") |