summaryrefslogtreecommitdiff
path: root/merge/src/merge_sth.erl
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2017-02-07 17:04:05 +0100
committerLinus Nordberg <linus@nordu.net>2017-02-07 17:04:05 +0100
commitab86700d805fac3ed46e593266f1e8c75b01e63e (patch)
treef365d80fdc0d2fcc201c46cfdcaa907024bad022 /merge/src/merge_sth.erl
parentb18454ba5f4f1da439cde6b6cb37aefc40f3ffbb (diff)
Use the minsize file.
Diffstat (limited to 'merge/src/merge_sth.erl')
-rw-r--r--merge/src/merge_sth.erl10
1 files changed, 8 insertions, 2 deletions
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, [])),