wip!

Author: doorgan

apps/expert/lib/expert/engine_node.ex

@@ -34,14 +34,16 @@ defmodule Expert.EngineNode do
       args =
         [
           "--erl",
-          "-start_epmd false",
-          "--sname",
-          Project.node_name(state.project),
+          "-start_epmd false -epmd_module #{Forge.EPMD}",
           "--cookie",
           state.cookie,
           "--no-halt",
           "-e",
-          "Forge.NodePortMapper.register(); IO.puts(\"ok\")"
+          """
+          Node.start(:"#{Project.node_name(state.project)}", :shortnames)
+          #{Forge.NodePortMapper}.register()
+          IO.puts(\"ok\")
+          """
           | path_append_arguments(paths)
         ]
 
@@ -74,7 +76,7 @@ defmodule Expert.EngineNode do
     end
 
     def on_nodeup(%__MODULE__{} = state, node_name) do
-      if node_name == Project.node_name(state.project) do
+      if String.starts_with?(to_string(node_name), to_string(Project.node_name(state.project)))  do
         {pid, _ref} = state.started_by
         Process.monitor(pid)
         GenServer.reply(state.started_by, :ok)
@@ -127,7 +129,6 @@ defmodule Expert.EngineNode do
   use GenServer
 
   def start(project) do
-    :ok = ensure_epmd_started()
     start_net_kernel(project)
 
     node_name = Project.node_name(project)
@@ -151,16 +152,6 @@ defmodule Expert.EngineNode do
     :rpc.call(node, Engine, :ensure_apps_started, [])
   end
 
-  defp ensure_epmd_started do
-    case System.cmd("epmd", ~w(-daemon)) do
-      {"", 0} ->
-        :ok
-
-      _ ->
-        {:error, :epmd_failed}
-    end
-  end
-
   if Mix.env() == :test do
     # In test environment, Expert depends on the Engine app, so we look for it
     # in the expert build path.
@@ -376,6 +367,7 @@ defmodule Expert.EngineNode do
 
   @impl true
   def handle_info({_port, {:data, message}}, %State{} = state) do
+    dbg(message)
     Logger.debug("Node port message: #{to_string(message)}")
     {:noreply, state}
   end

apps/expert/lib/expert/port.ex

@@ -106,7 +106,7 @@ defmodule Expert.Port do
         opts
       end
 
-    Port.open({:spawn_executable, launcher}, opts)
+    Port.open({:spawn_executable, launcher}, [:stderr_to_stdout | opts])
   end
 
   @doc """

apps/forge/lib/forge/epmd.ex

@@ -93,7 +93,7 @@ defmodule Forge.EPMD do
     :erl_epmd.port_please(name, host, timeout)
   end
 
-  defdelegate start_link(), to: :erl_epmd
+  defdelegate start_link, to: :erl_epmd
   defdelegate listen_port_please(name, host), to: :erl_epmd
   defdelegate address_please(name, host, family), to: :erl_epmd
   defdelegate names(host_name), to: :erl_epmd

apps/forge/lib/forge/node_port_mapper.ex

@@ -15,7 +15,7 @@ defmodule Forge.NodePortMapper do
     end
   end
 
-  def register() do
+  def register do
     GenServer.call({@name, parent_node()}, {:register, node(), Forge.EPMD.dist_port()})
   end
 

apps/forge/lib/forge/project.ex

@@ -77,7 +77,7 @@ defmodule Forge.Project do
   """
   def node_name(%__MODULE__{} = project) do
     {:ok, host} = :inet.gethostname()
-    :"expert-project-#{name(project)}-#{entropy(project)}@#{host}"
+    :"expert-project-#{name(project)}-#{entropy(project)}"
   end
 
   def entropy(%__MODULE__{} = project) do
@@ -165,6 +165,7 @@ defmodule Forge.Project do
   end
 
   def manager_node_name(%__MODULE__{} = project) do
+    {:ok, hostname} = :inet.gethostname()
     :"expert-manager-#{name(project)}-#{entropy(project)}"
   end