Fix zomp's app file, config from cmd line, add network config

2025-05-20 23:40:54 +02:00
parent 4a701102c1
commit 29fbfb3c87
5 changed files with 70 additions and 136 deletions
@@ -6,14 +6,26 @@
 -include("gmhc_events.hrl").

 get_pool_address() ->
-    URL0 = gmhc_config:get_config([<<"pool_admin">>, <<"url">>]),
-    case expand_url(URL0) of
-        <<"local">> ->
-            #{<<"address">> => <<"127.0.0.1">>,
-              <<"port">>    => gmconfig:get_config([<<"pool">>, <<"port">>], [schema_default]),
-              <<"pool_id">> => gmhc_config:get_config([<<"pool">>, <<"id">>]) };
-        URL ->
-            ?LOG_INFO("Trying to connect to ~p", [URL]),
+    case gmconfig:find_config([<<"pool_admin">>, <<"url">>], [user_config]) of
+        {ok, URL0} ->
+            case expand_url(URL0) of
+                <<"local">> ->
+                    #{<<"address">> => <<"127.0.0.1">>,
+                      <<"port">>    => gmconfig:get_config(
+                                         [<<"pool">>, <<"port">>], [schema_default]),
+                      <<"pool_id">> => gmhc_config:get_config([<<"pool">>, <<"id">>]) };
+                URL ->
+                    ?LOG_INFO("Trying to connect to ~p", [URL]),
+                    connect1(URL)
+            end;
+        undefined ->
+            Network = gmconfig:get_config([<<"network">>]),
+            URL0 = gmconfig:get_config([ <<"pool_admin">>
+                                       , <<"default_per_network">>
+                                       , Network ],
+                                       [schema_default]),
+            URL = expand_url(URL0),
+            ?LOG_INFO("Using default for ~p: ~p", [Network, URL]),
            connect1(URL)
    end.