Allow setting sname and cookie to enable distribution.

filmor · filmor · commit e3dd8bf1b0cb · 2017-05-31T23:19:01.000+02:00
diff --git a/src/ierl_cmd_install.erl b/src/ierl_cmd_install.erl
@@ -11,11 +11,14 @@ opt_spec() ->
      "Install a Jupyter kernelspec for this backend",
      [
       {name, $n, "name", string, "Install the kernel under this name "
-                                 "(defaults to the backend name"
+                                 "(defaults to the backend name)"
       },
       {copy, $c, "copy", boolean, "Copy the escript to make a standalone "
       "kernel"},
-      {node, undefined, "node", string, "Remote node to run against"}
+      {node, undefined, "node", string, "Remote node to run against"},
+      {sname, undefined, "sname", string, "Short name for this node "
+       "(defaults to the backend name"},
+      {cookie, undefined, "cookie", string, "Cookie"}
      ]
     }.
 
@@ -24,20 +27,18 @@ exec({BName, Backend}, ParsedArgs, _Rest) ->
     application:ensure_all_started(jsx),
 
     % TODO: Default to BName_Node
-
     Name = proplists:get_value(name, ParsedArgs, BName),
     Copy = proplists:get_value(copy, ParsedArgs, false),
 
-    Args = #{ copy => Copy },
+    Args = #{ copy => Copy, args => [] },
 
-    Args1 = case proplists:get_value(node, ParsedArgs, undefined) of
-                undefined ->
-                    Args;
-                Val ->
-                    Args#{
-                      args => [<<"--node">>, jup_util:ensure_binary(Val)]
-                     }
-            end,
+    Args1 = lists:foldl(
+              fun (PName, A) ->
+                      forward_arg(PName, ParsedArgs, A)
+              end,
+              Args,
+              [node, sname, cookie]
+             ),
 
     % TODO Parse rest and add to spec
 
@@ -46,3 +47,16 @@ exec({BName, Backend}, ParsedArgs, _Rest) ->
     io:format("Built kernel spec, storing~n"),
     ierl_kernelspec:write(Name, Spec),
     io:format("Installed kernel ~s with backend ~s~n", [Name, Backend]).
+
+
+forward_arg(Name, ParsedArgs, Args) ->
+    case proplists:get_value(Name, ParsedArgs, undefined) of
+        undefined ->
+            Args;
+        Val ->
+            Param = jup_util:ensure_binary(io_lib:format("--~p", [Name])),
+            Args#{
+              args => maps:get(args, Args, [])
+                      ++ [Param, jup_util:ensure_binary(Val)]
+             }
+    end.
diff --git a/src/ierl_cmd_run.erl b/src/ierl_cmd_run.erl
@@ -12,7 +12,10 @@ opt_spec() ->
      [
       {conn_file, $f, "conn-file", string, "Connection file provided by"
                                            " Jupyter"},
-      {node, undefined, "node", string, "Node to run this kernel on"}
+      {node, undefined, "node", string, "Node to run this kernel on"},
+      {sname, undefined, "sname", string, "Short name for this node "
+       "(defaults to the backend name"},
+      {cookie, undefined, "cookie", string, "Cookie"}
      ]
     }.
 
@@ -33,6 +36,23 @@ exec({BName, Backend}, ParsedArgs, Rest) ->
                    list_to_atom(Val)
            end,
 
+    SName = proplists:get_value(sname, ParsedArgs, atom_to_list(BName)),
+
+    SName1 = binary_to_atom(
+               list_to_binary(
+                 [SName, "_", base64:encode(crypto:strong_rand_bytes(6))]
+                ),
+               utf8
+              ),
+
+    net_kernel:start([SName1, shortnames]),
+    lager:info("Set node name to ~p", [SName1]),
+
+    case proplists:get_value(cookie, ParsedArgs, undefined) of
+        undefined -> ok;
+        Val1 -> erlang:setcookie(node(), list_to_atom(Val1))
+    end,
+
     lager:info("Starting Erlang kernel with connection file ~s against ~p",
                [JsonFile, Node]),
 
