Skip to content

Commit

Permalink
Depreciate Destinations - take 3.
Browse files Browse the repository at this point in the history
  • Loading branch information
cpursley committed Jun 21, 2024
1 parent 9658df8 commit 595fcfc
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 31 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
defmodule WalEx.Destinations.EventModules do
defmodule WalEx.Events.EventModules do
@moduledoc """
Process events (call modules containing process functions)
"""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
defmodule WalEx.Destinations do
defmodule WalEx.Events do
@moduledoc """
Process destinations
Process events
"""

use GenServer

alias WalEx.{Destinations, Config}
alias WalEx.{Events, Config}
alias Config.Registry
alias Destinations.EventModules
alias Events.EventModules

def start_link(opts) do
name =
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
defmodule WalEx.Destinations.Supervisor do
defmodule WalEx.Events.Supervisor do
@moduledoc false

use Supervisor

alias WalEx.Config
alias WalEx.Destinations
alias Destinations.EventModules
alias WalEx.Events
alias Events.EventModules

def start_link(opts) do
app_name = Keyword.get(opts, :name)
Expand All @@ -21,7 +21,7 @@ defmodule WalEx.Destinations.Supervisor do
|> Keyword.get(:name)

children =
[{Destinations, app_name: app_name}]
[{Events, app_name: app_name}]
|> maybe_event_modules(app_name)

Supervisor.init(children, strategy: :one_for_one, max_restarts: 10)
Expand Down
6 changes: 3 additions & 3 deletions lib/walex/replication/publisher.ex
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
defmodule WalEx.Replication.Publisher do
@moduledoc """
Publishes messages from Replication to Events & Destinations
Publishes messages from Replication to Events
"""
use GenServer

alias WalEx.{Changes, Config, Destinations, Types}
alias WalEx.{Changes, Config, Events, Types}
alias WalEx.Decoder.Messages

defmodule(State,
Expand Down Expand Up @@ -72,7 +72,7 @@ defmodule WalEx.Replication.Publisher do
%State{transaction: {current_txn_lsn, txn}, relations: _relations} = state
)
when commit_lsn == current_txn_lsn do
Destinations.process(txn, app_name)
Events.process(txn, app_name)
state
end

Expand Down
4 changes: 2 additions & 2 deletions lib/walex/supervisor.ex
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule WalEx.Supervisor do
use Supervisor

alias WalEx.Config, as: WalExConfig
alias WalEx.Destinations.Supervisor, as: DestinationsSupervisor
alias WalEx.Events.Supervisor, as: EventsSupervisor
alias WalEx.Replication.Supervisor, as: ReplicationSupervisor
alias WalExConfig.Registry, as: WalExRegistry

Expand Down Expand Up @@ -69,7 +69,7 @@ defmodule WalEx.Supervisor do

[
{WalExConfig, configs: configs},
{DestinationsSupervisor, configs},
{EventsSupervisor, configs},
{ReplicationSupervisor, app_name: app_name}
]
end
Expand Down
6 changes: 2 additions & 4 deletions test/walex/config/registry_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ defmodule WalEx.Config.RegistryTest do
assert GenServer.whereis(
WalExRegistry.set_name(
:set_supervisor,
WalEx.Destinations.Supervisor,
WalEx.Events.Supervisor,
:test_name
)
)
Expand All @@ -72,9 +72,7 @@ defmodule WalEx.Config.RegistryTest do
)
|> is_pid()

assert GenServer.whereis(
WalExRegistry.set_name(:set_gen_server, WalEx.Destinations, :test_name)
)
assert GenServer.whereis(WalExRegistry.set_name(:set_gen_server, WalEx.Events, :test_name))
|> is_pid()

assert GenServer.whereis(
Expand Down
12 changes: 6 additions & 6 deletions test/walex/event/event_dsl_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ defmodule WalEx.EventDslTest do
use ExUnit.Case, async: false
import WalEx.Support.TestHelpers

alias WalEx.Destinations.EventModules, as: DestinationsEventModules
alias WalEx.Destinations.Supervisor, as: DestinationsSupervisor
alias WalEx.Events.EventModules, as: EventsEventModules
alias WalEx.Events.Supervisor, as: EventsSupervisor
alias WalEx.Supervisor, as: WalExSupervisor

@app_name :test_app
Expand Down Expand Up @@ -36,12 +36,12 @@ defmodule WalEx.EventDslTest do
supervisor_pid: supervisor_pid,
database_pid: database_pid
} do
destinations_supervisor_pid = find_child_pid(supervisor_pid, DestinationsSupervisor)
destinations_supervisor_pid = find_child_pid(supervisor_pid, EventsSupervisor)

assert is_pid(destinations_supervisor_pid)

events_pid =
find_child_pid(destinations_supervisor_pid, DestinationsEventModules)
find_child_pid(destinations_supervisor_pid, EventsEventModules)

assert is_pid(events_pid)

Expand Down Expand Up @@ -69,12 +69,12 @@ defmodule WalEx.EventDslTest do
supervisor_pid: supervisor_pid,
database_pid: database_pid
} do
destinations_supervisor_pid = find_child_pid(supervisor_pid, DestinationsSupervisor)
destinations_supervisor_pid = find_child_pid(supervisor_pid, EventsSupervisor)

assert is_pid(destinations_supervisor_pid)

events_pid =
find_child_pid(destinations_supervisor_pid, DestinationsEventModules)
find_child_pid(destinations_supervisor_pid, EventsEventModules)

assert is_pid(events_pid)

Expand Down
14 changes: 7 additions & 7 deletions test/walex/event/event_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ defmodule WalEx.EventTest do
use ExUnit.Case, async: false
import WalEx.Support.TestHelpers

alias WalEx.Destinations.EventModules, as: DestinationsEventModules
alias WalEx.Destinations.Supervisor, as: DestinationsSupervisor
alias WalEx.Events.EventModules, as: EventsEventModules
alias WalEx.Events.Supervisor, as: EventsSupervisor
alias WalEx.Supervisor, as: WalExSupervisor
alias WalEx.Replication.Supervisor, as: ReplicationSupervisor
alias WalEx.Replication.Publisher, as: ReplicationPublisher
Expand Down Expand Up @@ -38,12 +38,12 @@ defmodule WalEx.EventTest do
database_pid: database_pid,
supervisor_pid: supervisor_pid
} do
destinations_supervisor_pid = find_child_pid(supervisor_pid, DestinationsSupervisor)
destinations_supervisor_pid = find_child_pid(supervisor_pid, EventsSupervisor)

assert is_pid(destinations_supervisor_pid)

events_pid =
find_child_pid(destinations_supervisor_pid, DestinationsEventModules)
find_child_pid(destinations_supervisor_pid, EventsEventModules)

assert is_pid(events_pid)

Expand Down Expand Up @@ -89,11 +89,11 @@ defmodule WalEx.EventTest do
database_pid: database_pid,
supervisor_pid: supervisor_pid
} do
destinations_supervisor_pid = find_child_pid(supervisor_pid, DestinationsSupervisor)
destinations_supervisor_pid = find_child_pid(supervisor_pid, EventsSupervisor)

assert is_pid(destinations_supervisor_pid)

events_pid = find_child_pid(destinations_supervisor_pid, DestinationsEventModules)
events_pid = find_child_pid(destinations_supervisor_pid, EventsEventModules)

assert is_pid(events_pid)

Expand Down Expand Up @@ -123,7 +123,7 @@ defmodule WalEx.EventTest do
:timer.sleep(1000)

new_events_pid =
find_child_pid(destinations_supervisor_pid, DestinationsEventModules)
find_child_pid(destinations_supervisor_pid, EventsEventModules)

assert is_pid(new_events_pid)
refute events_pid == new_events_pid
Expand Down

0 comments on commit 595fcfc

Please sign in to comment.