From ab86700d805fac3ed46e593266f1e8c75b01e63e Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Tue, 7 Feb 2017 17:04:05 +0100 Subject: Use the minsize file. --- merge/src/merge_sth.erl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'merge/src/merge_sth.erl') diff --git a/merge/src/merge_sth.erl b/merge/src/merge_sth.erl index 13d5204..17a6a0d 100644 --- a/merge/src/merge_sth.erl +++ b/merge/src/merge_sth.erl @@ -40,8 +40,14 @@ terminate(Reason, #state{timer = Timer}) -> %%%%%%%%%%%%%%%%%%%% make_sth(noentry, State) -> - lager:info("Waiting for sth file."), - {noreply, State#state{timer = erlang:start_timer(1000, self(), make_sth)}}; + case merge_util:readfile(minsize_path) of + noentry -> + lager:error("This log is invalid, missing both sth and minsize."), + exit({shutdown, invalid_log}); + {struct, PropList} -> + MinSize = proplists:get_value(<<"size">>, PropList), + make_sth(MinSize, State) + end; make_sth(CurSize, State) -> {MergeSecondaryNames, _MergeSecondaryAddrs} = lists:unzip(plopconfig:get_env(merge_secondaries, [])), -- cgit v1.1