Fix duplicated stats update and unused function clauses

basho · Jul 10, 2015 · 66f4012 · 66f4012 · kuenishi · Jul 10, 2015
1 parent e2f959c
commit 66f4012
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/riak_cs_wm_bucket.erl b/src/riak_cs_wm_bucket.erl
@@ -147,8 +147,7 @@ accept_body(RD, Ctx=#context{user=User,
 %% @doc Callback for deleting a bucket.
 -spec delete_resource(#wm_reqdata{}, #context{}) ->
                              {boolean() | {'halt', term()}, #wm_reqdata{}, #context{}}.
-delete_resource(RD, Ctx=#context{start_time=StartTime,
-                                 user=User,
+delete_resource(RD, Ctx=#context{user=User,
                                  user_object=UserObj,
                                  response_module=ResponseMod,
                                  bucket=Bucket,
@@ -162,7 +161,6 @@ delete_resource(RD, Ctx=#context{start_time=StartTime,
         ok ->
             riak_cs_dtrace:dt_bucket_return(?MODULE, <<"bucket_delete">>,
                                                [200], [riak_cs_wm_utils:extract_name(User), Bucket]),
-            ok = riak_cs_stats:update_with_start([bucket, delete], StartTime),
             {true, RD, Ctx};
         {error, Reason} ->
             Code = ResponseMod:status_code(Reason),

diff --git a/src/riak_cs_wm_utils.erl b/src/riak_cs_wm_utils.erl
@@ -349,19 +349,15 @@ streaming_get(RcPool, RcPid, FsmPid, StartTime, UserName, BFile_str) ->
             {Chunk, fun() -> streaming_get(RcPool, RcPid, FsmPid, StartTime, UserName, BFile_str) end}
     end.
 
--spec lower_case_method(atom() | string()) -> atom().
+-spec lower_case_method(atom()) -> atom().
 lower_case_method('GET') -> get;
 lower_case_method('HEAD') -> head;
 lower_case_method('POST') -> post;
 lower_case_method('PUT') -> put;
 lower_case_method('DELETE') -> delete;
 lower_case_method('TRACE') -> trace;
 lower_case_method('CONNECT') -> connect;
-lower_case_method('OPTIONS') -> options;
-lower_case_method(Method) when is_atom(Method) ->
-    lower_case_method(atom_to_list(Method));
-lower_case_method(Method) when is_list(Method) ->
-    list_to_atom(string:to_lower(Method)).
+lower_case_method('OPTIONS') -> options.
 
 %% @doc Get an ISO 8601 formatted timestamp representing
 %% current time.