[asterisk-commits] file: trunk r404030 - in /trunk: ./ res/res_sorcery_config.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Dec 17 12:35:39 2013
New Revision: 404030

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=404030
Log:
res_sorcery_config: Output an error message when an object can't be created.

If object creation fails an error message will now be output with the id, type,
and configuration file.
........

Merged revisions 404029 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_sorcery_config.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Tue Dec 17 12:35:39 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403290,403292-403778,403781-404006,404027
+/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403290,403292-403778,403781-404006,404027,404029

Modified: trunk/res/res_sorcery_config.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_sorcery_config.c?view=diff&rev=404030&r1=404029&r2=404030
==============================================================================
--- trunk/res/res_sorcery_config.c (original)
+++ trunk/res/res_sorcery_config.c Tue Dec 17 12:35:39 2013
@@ -265,14 +265,15 @@
 
 		if (!(obj = ast_sorcery_alloc(sorcery, type, id)) ||
 		    ast_sorcery_objectset_apply(sorcery, obj, ast_variable_browse(cfg, id))) {
-			ast_debug(1, "Could not create an object of type '%s' with id '%s' from configuration file '%s'\n",
-				  type, id, config->filename);
 
 			if (config->file_integrity) {
 				ast_log(LOG_ERROR, "Config file '%s' could not be loaded due to error with object '%s' of type '%s'\n",
 					config->filename, id, type);
 				ast_config_destroy(cfg);
 				return;
+			} else {
+				ast_log(LOG_ERROR, "Could not create an object of type '%s' with id '%s' from configuration file '%s'\n",
+					type, id, config->filename);
 			}
 
 			ao2_cleanup(obj);