@@ -67,13 +67,13 @@ extract_scope_alias_mapping(Proplist) ->
6767 S -> convert_space_separated_string_to_list_of_binaries (S )
6868 end ,
6969 case {Alias , Scope } of
70- {{error , _ } = Err0 , _ } ->
71- rabbit_log : error ( " Skipped wrong scope_aliases configuration: ~p " ,
72- [ Err0 ] ),
70+ {{error , _ }, _ } ->
71+ cuttlefish : warn (
72+ " Skipped scope_aliases due to missing alias attribute " ),
7373 {};
74- {_ , {error , _ } = Err1 } ->
75- rabbit_log : error ( " Skipped wrong scope_aliases configuration: ~p " ,
76- [ Err1 ] ),
74+ {_ , {error , _ }} ->
75+ cuttlefish : warn (
76+ " Skipped scope_aliases due to missing scope attribute " ),
7777 {};
7878 _ = V -> V
7979 end .
@@ -172,9 +172,9 @@ translate_list_of_signing_keys(ListOfKidPath) ->
172172 {ok , Bin } ->
173173 string :trim (Bin , trailing , " \n " );
174174 _Error ->
175- % % this throws and makes Cuttlefish treak the key as invalid
176- cuttlefish : invalid ( " file does not exist or cannot be " ++
177- " read by the node " )
175+ cuttlefish : invalid ( io_lib : format (
176+ " File ~p does not exist or cannot be read by the node " ,
177+ [ Path ]) )
178178 end
179179 end ,
180180 maps :map (fun (_K , Path ) -> {pem , TryReadingFileFun (Path )} end ,
@@ -193,7 +193,6 @@ validator_file_exists(Attr, Filename) ->
193193 {ok , _ } ->
194194 Filename ;
195195 _Error ->
196- % % this throws and makes Cuttlefish treak the key as invalid
197196 cuttlefish :invalid (io_lib :format (
198197 " Invalid attribute (~p ) value: file ~p does not exist or " ++
199198 " cannot be read by the node" , [Attr , Filename ]))
@@ -217,8 +216,8 @@ validator_https_uri(Attr, Uri) when is_list(Uri) ->
217216 true -> Uri ;
218217 false ->
219218 cuttlefish :invalid (io_lib :format (
220- " Invalid attribute (~p ) value: uri ~p must be a valid https uri " ,
221- [Attr , Uri ]))
219+ " Invalid attribute (~p ) value: uri ~p must be a valid " ++
220+ " https uri " , [Attr , Uri ]))
222221 end .
223222
224223merge_list_of_maps (ListOfMaps ) ->
0 commit comments