From: Evgeny Khramtsov <ekhramtsov@process-one.net>
Date: Sat, 19 Oct 2019 16:58:42 +0000 (+0300)
Subject: Fix error reporting in configuration related admin commands
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a85e51237384b348cc7a565cd9ccacc9daf478d;p=ejabberd

Fix error reporting in configuration related admin commands
---

diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl
index 7776af3a1..2dddb3cad 100644
--- a/src/ejabberd_admin.erl
+++ b/src/ejabberd_admin.erl
@@ -549,7 +549,7 @@ reload_config() ->
 	ok -> {ok, ""};
 	Err ->
 	    Reason = ejabberd_config:format_error(Err),
-	    {invalid_config, Reason}
+	    {error, Reason}
     end.
 
 dump_config(Path) ->
@@ -557,7 +557,7 @@ dump_config(Path) ->
 	ok -> {ok, ""};
 	Err ->
 	    Reason = ejabberd_config:format_error(Err),
-	    {invalid_file, Reason}
+	    {error, Reason}
     end.
 
 convert_to_yaml(In, Out) ->
@@ -565,7 +565,7 @@ convert_to_yaml(In, Out) ->
 	ok -> {ok, ""};
 	Err ->
 	    Reason = ejabberd_config:format_error(Err),
-	    {invalid_config, Reason}
+	    {error, Reason}
     end.
 
 %%%