summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2017-02-11 00:09:45 +0100
committerLinus Nordberg <linus@nordu.net>2017-02-11 00:09:45 +0100
commitff5e45a89bc7af61c396007f5cc6e34c999e0977 (patch)
treeb5dd86b25b03c6967d9b9b5e59afd2e50ba1174c
parent98477712c0d9ed067f10a1e86c1276494f295fcf (diff)
Don't divide merge_delay with 60 in merge_sth.
-rw-r--r--merge/src/merge_sth.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge/src/merge_sth.erl b/merge/src/merge_sth.erl
index 9e9486c..4e8649f 100644
--- a/merge/src/merge_sth.erl
+++ b/merge/src/merge_sth.erl
@@ -71,7 +71,7 @@ make_sth(CurSize, State) ->
1;
false ->
ok = do_make_sth(NewSize),
- max(1, round(application:get_env(plop, merge_delay, 600) / 60))
+ application:get_env(plop, merge_delay, 600)
end,
Timer = erlang:start_timer(Wait * 1000, self(), make_sth),
{noreply, State#state{timer = Timer}}.