[asterisk-commits] kmoore: trunk r429431 - in /trunk: ./ res/res_sorcery_config.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Fri Dec 12 08:04:06 2014
New Revision: 429431

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=429431
Log:
Sorcery: Log when old config remains in use

This adds a log message notifying the user that a stale configuration
is in place upon reload when a config object fails to load. This
situation can end up causing confusion when the object failed to load
but exists from a previous config load especially when the old config
is significantly different from the new config.

Review: https://reviewboard.asterisk.org/r/4250/
Reported by: Thomas Thompson
........

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

Merged revisions 429430 from http://svn.asterisk.org/svn/asterisk/branches/13

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/res/res_sorcery_config.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_sorcery_config.c?view=diff&rev=429431&r1=429430&r2=429431
==============================================================================
--- trunk/res/res_sorcery_config.c (original)
+++ trunk/res/res_sorcery_config.c Fri Dec 12 08:04:06 2014
@@ -284,6 +284,8 @@
 			if (!(obj = sorcery_config_retrieve_id(sorcery, data, type, id))) {
 				continue;
 			}
+
+			ast_log(LOG_NOTICE, "Retaining existing configuration for object of type '%s' with id '%s'\n", type, id);
 		}
 
 		ao2_link_flags(objects, obj, OBJ_NOLOCK);