Source

riak / src / riak_app.erl

Diff from to

src/riak_app.erl

         _ -> read_config()
     end,
     register(riak_app, self()),
-    erlang:set_cookie(node(), riak:get_app_env(riak_cookie)),
     riak_sup:start_link().
 
 %% @spec stop(State :: term()) -> ok
     % set some defaults for undefined fields
     [ClusterName,RingStateDir,RingCreationSize,
      WantsClaimFun,ChooseClaimFun,GossipInterval,
-     DoorbellPort,StorageBackend,RiakCookie,RiakAddPaths,
-     RiakNodeName,RiakHostName,RiakHeartCommand,
+     StorageBackend,RiakAddPaths, RiakHeartCommand,
      DefaultBucketProps,RiakStartApps] =
         [riak:get_app_env(X) || X <- 
            [cluster_name,ring_state_dir,ring_creation_size,
             wants_claim_fun,choose_claim_fun,gossip_interval,
-            doorbell_port,storage_backend,riak_cookie,add_paths,
-            riak_nodename,riak_hostname,riak_heart_command,
+            storage_backend,add_paths, riak_heart_command,
             default_bucket_props,start_apps]],
     if
         ClusterName =:= undefined ->
         true -> ok
     end,
     if
-        DoorbellPort =:= undefined ->
-            io_lib:format(
-                  "doorbell_port unset in ~p, no UDP service.",[ConfigPath]);
-        is_integer(DoorbellPort) =:= false ->
-            riak:stop(io_lib:format(
-                "doorbell_port set to ~p in ~p, must be integer",
-                          [DoorbellPort,ConfigPath]));
-        true -> ok
-    end,
-    if
         StorageBackend =:= undefined ->
             nop; % but you had better know what you're doing!
         not is_atom(StorageBackend) ->
         true -> ok
     end,
     if
-        RiakCookie =:= undefined ->
-            riak:stop(io_lib:format(
-                       "riak_cookie unset in ~p, failing.",[ConfigPath]));
-        not is_atom(RiakCookie) ->
-            riak:stop(io_lib:format(
-                       "riak_cookie in ~p non-atom, failing.",[ConfigPath]));
-        true -> ok
-    end,
-    if
         RiakAddPaths =:= undefined ->
             error_logger:info_msg(
               "add_paths unset in ~p, setting to []~n",
         true -> ok
     end,
     if
-        % this one has to stop hard, as we test it before starting the app
-        RiakNodeName =:= undefined ->
-            io:format("no_riak_nodename_"),
-            init:stop();
-        not is_atom(RiakNodeName) ->
-            io:format("no_riak_nodename_"),
-            init:stop();
-        true -> ok
-    end,
-    if
-        % this one has to stop hard, as we test it before starting the app
-        RiakHostName =:= undefined ->
-            io:format("no_riak_hostname_"),
-            init:stop();
-        not is_list(RiakHostName) ->
-            io:format("no_riak_hostname_"),
-            init:stop();
-        true -> ok
-    end,
-    if
         RiakHeartCommand =:= undefined ->
             application:set_env(riak, riak_heart_command, "fail_to_restart");
         not is_list(RiakHeartCommand) ->
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.