Explorar el Código

fix: dialyzer warning

zhongwencool hace 2 años
padre
commit
dd687d9582

+ 1 - 5
apps/emqx_bridge/src/emqx_bridge_resource.erl

@@ -298,11 +298,7 @@ remove(Type, Name) ->
 %% just for perform_bridge_changes/1
 remove(Type, Name, _Conf, _Opts) ->
     ?SLOG(info, #{msg => "remove_bridge", type => Type, name => Name}),
-    case emqx_resource:remove_local(resource_id(Type, Name)) of
-        ok -> ok;
-        {error, not_found} -> ok;
-        {error, Reason} -> {error, Reason}
-    end.
+    emqx_resource:remove_local(resource_id(Type, Name)).
 
 %% convert bridge configs to what the connector modules want
 parse_confs(

+ 1 - 1
apps/emqx_resource/src/emqx_resource.erl

@@ -266,7 +266,7 @@ remove_local(ResId) ->
         {error, not_found} ->
             ok;
         Error ->
-            %% Only log, the ResId worker is always remove in manager's remove action.
+            %% Only log, the ResId worker is always removed in manager's remove action.
             ?SLOG(warning, #{
                 msg => "remove_local_resource_failed",
                 error => Error,

+ 1 - 1
apps/emqx_resource/test/emqx_resource_SUITE.erl

@@ -110,7 +110,7 @@ t_create_remove(_) ->
             ?assert(is_process_alive(Pid)),
 
             ?assertEqual(ok, emqx_resource:remove(?ID)),
-            ?assertMatch({error, _}, emqx_resource:remove(?ID)),
+            ?assertMatch(ok, emqx_resource:remove(?ID)),
 
             ?assertNot(is_process_alive(Pid))
         end,