From 107f00d93f605239da0896bee0510b652646b57b Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Tue, 28 Nov 2023 17:22:24 +0000 Subject: OTP26: Chase the :slave.start/3 deprecation --- test/support/cluster.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/support/cluster.ex') diff --git a/test/support/cluster.ex b/test/support/cluster.ex index 1c923fb0c..dd853f1ab 100644 --- a/test/support/cluster.ex +++ b/test/support/cluster.ex @@ -127,7 +127,7 @@ defmodule Pleroma.Cluster do defp start_slave({node_host, override_configs}) do log(node_host, "booting federated VM") - {:ok, node} = :slave.start(~c"127.0.0.1", node_name(node_host), vm_args()) + {:ok, node} = :peer.start(%{host: "127.0.0.1", name: node_name(node_host), args: vm_args()}) add_code_paths(node) load_apps_and_transfer_configuration(node, override_configs) ensure_apps_started(node) -- cgit v1.2.3 From 45150848fb4ae1b6b9ccce1cf8aee415313e1ad3 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Wed, 20 Dec 2023 15:48:50 -0500 Subject: Backwards compatibility for OTP --- test/support/cluster.ex | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'test/support/cluster.ex') diff --git a/test/support/cluster.ex b/test/support/cluster.ex index dd853f1ab..25170163f 100644 --- a/test/support/cluster.ex +++ b/test/support/cluster.ex @@ -127,7 +127,10 @@ defmodule Pleroma.Cluster do defp start_slave({node_host, override_configs}) do log(node_host, "booting federated VM") - {:ok, node} = :peer.start(%{host: "127.0.0.1", name: node_name(node_host), args: vm_args()}) + + {:ok, node} = + do_start_slave(%{host: "127.0.0.1", name: node_name(node_host), args: vm_args()}) + add_code_paths(node) load_apps_and_transfer_configuration(node, override_configs) ensure_apps_started(node) @@ -219,4 +222,18 @@ defmodule Pleroma.Cluster do |> Enum.at(0) |> String.to_atom() end + + if System.otp_release() >= "25" do + @peer :peer + else + @peer :slave + end + + defp do_start_slave(%{host: host, name: name, args: args} = opts) do + if System.otp_release() >= "25" do + @peer.start(opts) + else + @peer.start(host, name, args) + end + end end -- cgit v1.2.3 From 928bda2e439285ef3e662290c0cc6b782909fb82 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Wed, 20 Dec 2023 17:49:30 -0500 Subject: Fix invalid string comparison for OTP versions and replace with config Old way was wrong for multiple reasons. If we do this as a config value it fixes :slave.start/3 being picked up as a compile warning on OTP26. Also if we want to do any real clustering we'll need something like this to support OTP25 and older. --- test/support/cluster.ex | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'test/support/cluster.ex') diff --git a/test/support/cluster.ex b/test/support/cluster.ex index 25170163f..a0ec91168 100644 --- a/test/support/cluster.ex +++ b/test/support/cluster.ex @@ -223,17 +223,13 @@ defmodule Pleroma.Cluster do |> String.to_atom() end - if System.otp_release() >= "25" do - @peer :peer - else - @peer :slave - end - defp do_start_slave(%{host: host, name: name, args: args} = opts) do - if System.otp_release() >= "25" do - @peer.start(opts) + peer_module = Application.get_env(__MODULE__, :peer_module) + + if peer_module == :peer do + peer_module.start(opts) else - @peer.start(host, name, args) + peer_module.start(host, name, args) end end end -- cgit v1.2.3