Permalink
Browse files

Merge pull request #55 from basho/jem-os-timestamp

Change erlang:now() -> os:timestamp() when it is safe
  • Loading branch information...
2 parents 10c0023 + 4e2276c commit 0f59e13732649016c1dc2e2e2d65096f98eb4f84 Jared Morrow committed Sep 8, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/bitcask_merge_worker.erl
@@ -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",

0 comments on commit 0f59e13

Please sign in to comment.