[asterisk-commits] dlee: trunk r399051 - in /trunk: ./ res/

[SVN commits to the Asterisk project]

Author: dlee
Date: Fri Sep 13 09:22:07 2013
New Revision: 399051

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=399051
Log:
res_pjsip: Forward PJSIP logging to Asterisk logging

This patch uses PJSIP's pj_log_set_log_func() to forward PJSIP's log
messages to Asterisk's logger. This is done in a new module:
res_pjsip_log_forwarder.so.

This patch sets defaultenabled on the existing res_pjsip_logger.so to
no, since logging every SIP packet seems a bit odd to do by default, and
is (hopefully) less necessary with regular PJSIP logging.

It also removes res_rtp_asterisk's disabling of PJSIP logging.

(closes issue ASTERISK-22360)
Reported by: Joshua Colp
Review: https://reviewboard.asterisk.org/r/2830/
........

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

Added:
    trunk/res/res_pjsip_log_forwarder.c
      - copied unchanged from r399049, branches/12/res/res_pjsip_log_forwarder.c
Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_logger.c
    trunk/res/res_rtp_asterisk.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Fri Sep 13 09:22:07 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399039
+/branches/12:1-398558,398560-398577,398579-399049

Modified: trunk/res/res_pjsip_logger.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_logger.c?view=diff&rev=399051&r1=399050&r2=399051
==============================================================================
--- trunk/res/res_pjsip_logger.c (original)
+++ trunk/res/res_pjsip_logger.c Fri Sep 13 09:22:07 2013
@@ -19,6 +19,7 @@
 /*** MODULEINFO
 	<depend>pjproject</depend>
 	<depend>res_pjsip</depend>
+	<defaultenabled>no</defaultenabled>
 	<support_level>core</support_level>
  ***/
 

Modified: trunk/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_rtp_asterisk.c?view=diff&rev=399051&r1=399050&r2=399051
==============================================================================
--- trunk/res/res_rtp_asterisk.c (original)
+++ trunk/res/res_rtp_asterisk.c Fri Sep 13 09:22:07 2013
@@ -4537,8 +4537,6 @@
 #ifdef HAVE_PJPROJECT
 	pj_lock_t *lock;
 
-	pj_log_set_level(0);
-
 	if (pj_init() != PJ_SUCCESS) {
 		return AST_MODULE_LOAD_DECLINE;
 	}