@@ -67,13 +67,13 @@ extract_scope_alias_mapping(Proplist) ->
67
67
S -> convert_space_separated_string_to_list_of_binaries (S )
68
68
end ,
69
69
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 " ),
73
73
{};
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 " ),
77
77
{};
78
78
_ = V -> V
79
79
end .
@@ -172,9 +172,9 @@ translate_list_of_signing_keys(ListOfKidPath) ->
172
172
{ok , Bin } ->
173
173
string :trim (Bin , trailing , " \n " );
174
174
_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 ]) )
178
178
end
179
179
end ,
180
180
maps :map (fun (_K , Path ) -> {pem , TryReadingFileFun (Path )} end ,
@@ -193,7 +193,6 @@ validator_file_exists(Attr, Filename) ->
193
193
{ok , _ } ->
194
194
Filename ;
195
195
_Error ->
196
- % % this throws and makes Cuttlefish treak the key as invalid
197
196
cuttlefish :invalid (io_lib :format (
198
197
" Invalid attribute (~p ) value: file ~p does not exist or " ++
199
198
" cannot be read by the node" , [Attr , Filename ]))
@@ -217,8 +216,8 @@ validator_https_uri(Attr, Uri) when is_list(Uri) ->
217
216
true -> Uri ;
218
217
false ->
219
218
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 ]))
222
221
end .
223
222
224
223
merge_list_of_maps (ListOfMaps ) ->
0 commit comments