rabbit_definitions: resolve conflicts

(cherry picked from commit ab19045)

Author: michaelklishin

deps/rabbit/src/rabbit_definitions.erl

@@ -268,19 +268,11 @@ maybe_load_definitions_from_local_filesystem(App, Key) ->
 
             case should_skip_if_unchanged() of
                 false ->
-<<<<<<< HEAD
-                    rabbit_log:debug("Will use module ~s to import definitions", [Mod]),
-                    Mod:load(IsDir, Path);
-                true ->
-                    Algo = rabbit_definitions_hashing:hashing_algorithm(),
-                    rabbit_log:debug("Will use module ~s to import definitions (if definition file/directory has changed, hashing algo: ~s)", [Mod, Algo]),
-=======
                     rabbit_log:debug("Will re-import definitions even if they have not changed"),
                     Mod:load(IsDir, Path);
                 true ->
                     Algo = rabbit_definitions_hashing:hashing_algorithm(),
                     rabbit_log:debug("Will import definitions only if definition file/directory has changed, hashing algo: ~ts", [Algo]),
->>>>>>> 975dced74c (Closes #7685)
                     CurrentHash = rabbit_definitions_hashing:stored_global_hash(),
                     rabbit_log:debug("Previously stored hash value of imported definitions: ~s...", [binary:part(rabbit_misc:hexify(CurrentHash), 0, 12)]),
                     case Mod:load_with_hashing(IsDir, Path, CurrentHash, Algo) of

deps/rabbit/src/rabbit_definitions_import_local_filesystem.erl

@@ -50,31 +50,13 @@ load(Proplist) when is_list(Proplist) ->
     case pget(local_path, Proplist, undefined) of
         undefined -> {error, "local definition file path is not configured: local_path is not set"};
         Path      ->
-<<<<<<< HEAD
-            rabbit_log:debug("Asked to import definitions from a local file or directory at '~s'", [Path]),
-            case file:read_file_info(Path, [raw]) of
-                {ok, FileInfo} ->
-                    %% same check is used by Cuttlefish validation, this is to be extra defensive
-                    IsReadable = (element(4, FileInfo) == read) or (element(4, FileInfo) == read_write),
-                    case IsReadable of
-                        true ->
-                            load_from_single_file(Path);
-                        false ->
-                            Msg = rabbit_misc:format("local definition file '~s' does not exist or cannot be read by the node", [Path]),
-                            {error, Msg}
-                    end;
-                _ ->
-                    Msg = rabbit_misc:format("local definition file '~s' does not exist or cannot be read by the node", [Path]),
-                    {error, {could_not_read_defs, Msg}}
-=======
             rabbit_log:debug("Asked to import definitions from a local file or directory at '~ts'", [Path]),
             IsDir = filelib:is_dir(Path),
             case IsDir of
                 true ->
                     load_from_local_path(true, Path);
                 false ->
                     load_from_single_file(Path)
->>>>>>> 975dced74c (Closes #7685)
             end
     end;
 load(Map) when is_map(Map) ->
@@ -217,16 +199,6 @@ load_from_multiple_files([File|Rest]) ->
     end.
 
 load_from_single_file(Path) ->
-<<<<<<< HEAD
-    rabbit_log:debug("Will try to load definitions from a local file or directory at '~s'", [Path]),
-    case rabbit_misc:raw_read_file(Path) of
-        {ok, Body} ->
-            rabbit_log:info("Applying definitions from file at '~s'", [Path]),
-            import_raw(Body);
-        {error, E} ->
-            rabbit_log:error("Could not read definitions from file at '~s', error: ~p", [Path, E]),
-            {error, {could_not_read_defs, {Path, E}}}
-=======
     rabbit_log:debug("Will try to load definitions from a local file or directory at '~ts'", [Path]),
 
     case file:read_file_info(Path, [raw]) of
@@ -250,5 +222,4 @@ load_from_single_file(Path) ->
         _ ->
             Msg = rabbit_misc:format("local definition file '~ts' does not exist or cannot be read by the node", [Path]),
             {error, {could_not_read_defs, Msg}}
->>>>>>> 975dced74c (Closes #7685)
     end.