Maxim Sokhatsky 12 лет назад
Родитель
Сommit
571953a379
4 измененных файлов с 6 добавлено и 18 удалено
  1. 2 2
      src/kvs.erl
  2. 1 15
      src/kvs_sup.erl
  3. 2 1
      src/store_mnesia.erl
  4. 1 0
      src/store_riak.erl

+ 2 - 2
src/kvs.erl

@@ -16,7 +16,7 @@
 -include_lib("kvs/include/feed_state.hrl").
 -compile(export_all).
 
--define(DBA, store_riak).
+-define(DBA, store_mnesia).
 
 start() -> DBA = ?DBA, DBA:start().
 dir() -> DBA = ?DBA, DBA:dir().
@@ -135,7 +135,7 @@ add_sample_users() ->
     ok.
 
 add_sample_packages() -> kvs_membership:add_sample_data().
-version() -> ?INFO("version: ~p", [1]).
+version() -> DBA=?DBA, DBA:version().
 
 add_configs() ->
     %% smtp

+ 1 - 15
src/kvs_sup.erl

@@ -18,22 +18,8 @@ init([]) ->
   Shutdown = 2000,
   Type = worker,
 
-  case application:get_env(kvs, riak_srv_node) of
-    undefined ->
-      error_logger:info_msg("Waiting for Riak to Start...."),
-      kvs:start(),
-      error_logger:info_msg("Waiting for Riak to Initialize....");
-    {ok, _Value} -> skip end,
-
+  kvs:start(),
   kvs:initialize(),
 
-  case application:get_env(kvs, riak_srv_node) of
-    undefined ->
-      case application:get_env(kvs, sync_nodes) of
-         true -> [error_logger:info_msg("Joined: ~p ~p~n", [N, riak_core:join(N)]) || N <- application:get_env(kvs, nodes) -- [node()] ];
-         _ -> skip end,
-      case application:get_env(kvs, pass_init_db) of true -> pass; _ -> kvs:init_db() end;
-    _ -> skip end,
-
   {ok, { {one_for_one, 5, 10}, []} }.
 

+ 2 - 1
src/store_mnesia.erl

@@ -18,9 +18,10 @@
 -compile(export_all).
 -define(CREATE_TAB(T), create_table(T, record_info(fields, T), [{storage, permanent}]) ).
 
-start() -> mnesia:start(), mnesia:change_table_copy_type(schema, node(), disc_copies).
+start() -> mnesia:change_table_copy_type(schema, node(), disc_copies).
 stop() -> mnesia:stop().
 delete() -> mnesia:delete_schema([node()]).
+version() -> {version,"MNESIA Embedded"}.
 initialize() ->
     mnesia:create_schema([node()]),
     ?CREATE_TAB(payment),

+ 1 - 0
src/store_riak.erl

@@ -18,6 +18,7 @@
 
 start() -> ok.
 stop() -> ok.
+version() -> {version,"RIAK 1.3.2"}.
 
 initialize() ->
     C = riak:client_connect(node()),