yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ft-s3): fix atom and variable naming

This commit is contained in:
Ilya Averyanov 2023-04-04 13:05:02 +03:00
parent 71965d90e4
commit 4fbabe5a76
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_s3/src/emqx_s3_client.erl
View File

@ -105,7 +105,7 @@ start_multipart(
) -> ) ->
case erlcloud_s3:start_multipart(Bucket, key(Key), Options, Headers, AwsConfig) of case erlcloud_s3:start_multipart(Bucket, key(Key), Options, Headers, AwsConfig) of
{ok, Props} -> {ok, Props} ->
{ok, proplists:get_value(uploadId, Props)}; {ok, proplists:get_value('uploadId', Props)};
{error, Reason} -> {error, Reason} ->
?SLOG(debug, #{msg => "start_multipart_fail", key => Key, reason => Reason}), ?SLOG(debug, #{msg => "start_multipart_fail", key => Key, reason => Reason}),
{error, Reason} {error, Reason}

12
apps/emqx_s3/src/emqx_s3_profile_http_pools.erl
View File

@ -96,11 +96,11 @@ set_outdated(ProfileId, PoolName, Timeout) ->
outdated(ProfileId) -> outdated(ProfileId) ->
Now = erlang:monotonic_time(millisecond), Now = erlang:monotonic_time(millisecond),
MS = ets:fun2ms( MS = ets:fun2ms(
fun(#pool{key = {ProfileId_, PoolName}, deadline = Deadline_}) when fun(#pool{key = {CurProfileId, CurPoolName}, deadline = CurDeadline}) when
ProfileId_ =:= ProfileId andalso CurProfileId =:= ProfileId andalso
Deadline_ =/= undefined andalso Deadline_ < Now CurDeadline =/= undefined andalso CurDeadline < Now
-> ->
PoolName CurPoolName
end end
), ),
ets:select(?TAB, MS). ets:select(?TAB, MS).
@ -109,8 +109,8 @@ outdated(ProfileId) ->
[pool_name()]. [pool_name()].
all(ProfileId) -> all(ProfileId) ->
MS = ets:fun2ms( MS = ets:fun2ms(
fun(#pool{key = {ProfileId_, PoolName}}) when ProfileId_ =:= ProfileId -> fun(#pool{key = {CurProfileId, CurPoolName}}) when CurProfileId =:= ProfileId ->
PoolName CurPoolName
end end
), ),
ets:select(?TAB, MS). ets:select(?TAB, MS).