Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

don't use the ini to load couch_uuids.

This module is always needed, there is no need to keep it in the
configuration file.
  • Loading branch information...
commit 3d3d62b55c92b577d58a7c4ce5a93c475fa9500c 1 parent b9cb88f
Benoit Chesneau authored May 22, 2012
6  apps/couch/src/couch_primary_sup.erl
@@ -19,6 +19,12 @@ start_link() ->
19 19
 
20 20
 init([]) ->
21 21
     Children = [
  22
+        {couch_uuids,
  23
+            {couch_uuids, start_link, []},
  24
+            permanent,
  25
+            brutal_kill,
  26
+            worker,
  27
+            [couch_uuids]},
22 28
         {couch_task_status,
23 29
             {couch_task_status, start_link, []},
24 30
             permanent,
4  apps/couch/src/couch_uuids.erl
@@ -14,13 +14,13 @@
14 14
 
15 15
 -behaviour(gen_server).
16 16
 
17  
--export([start/0, stop/0]).
  17
+-export([start_link/0, stop/0]).
18 18
 -export([new/0, random/0, utc_random/0]).
19 19
 
20 20
 -export([init/1, terminate/2, code_change/3]).
21 21
 -export([handle_call/3, handle_cast/2, handle_info/2]).
22 22
 
23  
-start() ->
  23
+start_link() ->
24 24
     gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
25 25
 
26 26
 stop() ->
2  apps/couch/test/etap/041-uuid-gen.t
@@ -26,7 +26,7 @@ utc_alg_config() ->
26 26
 run_test(IniFiles, Test) ->
27 27
     {ok, Pid} = couch_config:start_link(IniFiles),
28 28
     erlang:monitor(process, Pid),
29  
-    couch_uuids:start(),
  29
+    couch_uuids:start_link(),
30 30
     Test(),
31 31
     couch_uuids:stop(),
32 32
     couch_config:stop(),
1  test/files/default.ini
@@ -106,7 +106,6 @@ external_manager={couch_external_manager, start_link, []}
106 106
 query_servers={couch_query_servers, start_link, []}
107 107
 stats_aggregator={couch_stats_aggregator, start, []}
108 108
 stats_collector={couch_stats_collector, start, []}
109  
-uuids={couch_uuids, start, []}
110 109
 os_daemons={couch_os_daemons, start_link, []}
111 110
 compaction_daemon={couch_compaction_daemon, start_link, []}
112 111
 

0 notes on commit 3d3d62b

Please sign in to comment.
Something went wrong with that request. Please try again.