Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Change erlang:now() -> os:timestamp() when it is safe

  • Loading branch information...
commit 4e2276c4e3a25b02d3d63094779b8cf86aa3520a 1 parent 10c0023
Jared Morrow jaredmorrow authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/bitcask_merge_worker.erl
4 src/bitcask_merge_worker.erl
View
@@ -126,9 +126,9 @@ do_merge(Args) ->
{_, {Hour, _, _}} = calendar:local_time(),
case in_merge_window(Hour, merge_window()) of
true ->
- Start = now(),
+ Start = os:timestamp(),
Result = (catch apply(bitcask, merge, Args)),
- ElapsedSecs = timer:now_diff(now(), Start) / 1000000,
+ ElapsedSecs = timer:now_diff(os:timestamp(), Start) / 1000000,
case Result of
ok ->
error_logger:info_msg("Merged ~p in ~p seconds.\n",
Please sign in to comment.
Something went wrong with that request. Please try again.