beenull/farside
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove FARSIDE_NO_ROUTER env var

Browse source 
The FARSIDE_NO_ROUTER variable wasn't terribly useful after refactoring
the app to include the update routine internally (rather than available
externally as an elixir script).

Now the only supported environment variable is FARSIDE_TEST, which is
still useful for tests and quick validation of functionality.
This commit is contained in:
Ben Busby 2021-12-09 15:33:58 -07:00
parent f887ad0400
commit 1092350fcd
No known key found for this signature in database
GPG key ID: B9B7231E01D924A1
3 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -77,5 +77,4 @@ request per second per IP.
| Name | Purpose | | Name | Purpose |
| -- | -- | | -- | -- |
| FARSIDE_TEST | If enabled, skips the instance availability check in `update.exs`. | | FARSIDE_TEST | If enabled, bypasses the instance availability check and adds all instances to the pool. |
| FARSIDE_NO_ROUTER | If enabled, skips creation of the router. Useful for running `update.exs` with `mix run` when the app is already running. |

12
lib/farside/application.ex
View file

@ -7,9 +7,7 @@ defmodule Farside.Application do
@impl true @impl true
def start(_type, _args) do def start(_type, _args) do
plug_children = children = [
(System.get_env("FARSIDE_NO_ROUTER") && []) ||
[
Plug.Cowboy.child_spec( Plug.Cowboy.child_spec(
scheme: :http, scheme: :http,
plug: Farside.Router, plug: Farside.Router,
@ -17,15 +15,11 @@ defmodule Farside.Application do
port: @farside_port port: @farside_port
] ]
), ),
{PlugAttack.Storage.Ets, name: Farside.Throttle.Storage, clean_period: 60_000} {PlugAttack.Storage.Ets, name: Farside.Throttle.Storage, clean_period: 60_000},
]
children =
[
{Redix, {@redis_conn, [name: :redix]}}, {Redix, {@redis_conn, [name: :redix]}},
Farside.Scheduler, Farside.Scheduler,
Farside.Server Farside.Server
] ++ plug_children ]
opts = [strategy: :one_for_one, name: Farside.Supervisor] opts = [strategy: :one_for_one, name: Farside.Supervisor]
Supervisor.start_link(children, opts) Supervisor.start_link(children, opts)

3
lib/farside/instances.ex
View file

@ -45,7 +45,8 @@ defmodule Farside.Instances do
result = result =
Enum.filter(service.instances, fn instance_url -> Enum.filter(service.instances, fn instance_url ->
request_url = instance_url <> request_url =
instance_url <>
EEx.eval_string( EEx.eval_string(
service.test_url, service.test_url,
query: Enum.random(@queries) query: Enum.random(@queries)