Permalink
Browse files

Remove trailing whitespace and cleaned up logging

  • Loading branch information...
1 parent 493435f commit d5bc21b8dfb51f064dad24617dfb010f6e1bff38 @bsparrow435 bsparrow435 committed Apr 25, 2013
Showing with 3 additions and 6 deletions.
  1. +0 −3 src/bitcask.erl
  2. +3 −3 src/bitcask_merge_worker.erl
View
@@ -140,9 +140,6 @@ open(Dirname, Opts) ->
{error, Reason}
end.
-
-
-
%% @doc Close a bitcask data store and flush any pending writes to disk.
-spec close(reference()) -> ok.
close(Ref) ->
@@ -132,14 +132,14 @@ do_merge(Args) ->
Start = os:timestamp(),
Result = (catch apply(bitcask, merge, Args)),
ElapsedSecs = timer:now_diff(os:timestamp(), Start) / 1000000,
+ [_,_,{Pargs,_}] = Args,
case Result of
ok ->
- % TODO: Don't log all the Args, just the merged file names
error_logger:info_msg("Merged ~p in ~p seconds.\n",
- [Args, ElapsedSecs]);
+ [Pargs, ElapsedSecs]);
{Error, Reason} when Error == error; Error == 'EXIT' ->
error_logger:error_msg("Failed to merge ~p: ~p\n",
- [Args, Reason])
+ [Pargs, Reason])
end;
false ->
ok

0 comments on commit d5bc21b

Please sign in to comment.