[asterisk-commits] mjordan: branch 12 r399365 - in /branches/12: ./ bridges/bridge_softmix.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Sep 18 12:20:46 2013
New Revision: 399365

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=399365
Log:
Add a WARNING in bridge_softmix when a timing module isn't loaded

If bridge_softmix fails to be created because no timing source is present in
Asterisk, this will currently fail gracefully but with (most likely) a generic
error message by whatever module tried to create the softmix bridge. This
patch adds a more explicit warning so you can actually diagnose and fix the
problem.

Review: https://reviewboard.asterisk.org/r/2857/
........

Merged revisions 399353 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/bridges/bridge_softmix.c

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

Modified: branches/12/bridges/bridge_softmix.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/bridges/bridge_softmix.c?view=diff&rev=399365&r1=399364&r2=399365
==============================================================================
--- branches/12/bridges/bridge_softmix.c (original)
+++ branches/12/bridges/bridge_softmix.c Wed Sep 18 12:20:46 2013
@@ -1044,6 +1044,7 @@
 	ast_mutex_init(&softmix_data->lock);
 	softmix_data->timer = ast_timer_open();
 	if (!softmix_data->timer) {
+		ast_log(AST_LOG_WARNING, "Failed to open timer for softmix bridge\n");
 		softmix_bridge_data_destroy(softmix_data);
 		return -1;
 	}