[svn-commits] file: trunk r400443 - in /trunk: ./ main/cdr.c

[SVN commits to the Digium repositories]

Author: file
Date: Thu Oct  3 14:32:46 2013
New Revision: 400443

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=400443
Log:
When serializing CDR variables (like for "core show channels") don't output an error if CDRs aren't enabled.
........

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

Modified:
    trunk/   (props changed)
    trunk/main/cdr.c

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

Modified: trunk/main/cdr.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/cdr.c?view=diff&rev=400443&r1=400442&r2=400443
==============================================================================
--- trunk/main/cdr.c (original)
+++ trunk/main/cdr.c Thu Oct  3 14:32:46 2013
@@ -3002,7 +3002,13 @@
 	}
 
 	if (!cdr) {
-		ast_log(AST_LOG_ERROR, "Unable to find CDR for channel %s\n", channel_name);
+		RAII_VAR(struct module_config *, mod_cfg,
+			 ao2_global_obj_ref(module_configs), ao2_cleanup);
+
+		if (ast_test_flag(&mod_cfg->general->settings, CDR_ENABLED)) {
+			ast_log(AST_LOG_ERROR, "Unable to find CDR for channel %s\n", channel_name);
+		}
+
 		return 0;
 	}