[svn-commits] kmoore: trunk r424770 - in /trunk: ./ main/stasis.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Tue Oct  7 15:33:29 2014
New Revision: 424770

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424770
Log:
Stasis: Only log errors for non-declined types

When message type creation is declined via stasis.conf, certain
operations log errors assuming that the declined type is being used
before initialization or after destruction. These error messages get
quite spammy for oft used message types and should not be logged in the
first place since the message type is validly NULL.

Reported by: Matt DiMeo
........

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

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

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

Modified: trunk/main/stasis.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/stasis.c?view=diff&rev=424770&r1=424769&r2=424770
==============================================================================
--- trunk/main/stasis.c (original)
+++ trunk/main/stasis.c Tue Oct  7 15:33:29 2014
@@ -1132,7 +1132,9 @@
 
 void stasis_log_bad_type_access(const char *name)
 {
-	ast_log(LOG_ERROR, "Use of %s() before init/after destruction\n", name);
+	if (!stasis_message_type_declined(name)) {
+		ast_log(LOG_ERROR, "Use of %s() before init/after destruction\n", name);
+	}
 }
 
 /*! \brief A multi object blob data structure to carry user event stasis messages */