From e95ef1b2e0866fd5d2c65dca630098b3afd8ae1d Mon Sep 17 00:00:00 2001 From: "Adam Roach [:abr]" Date: Fri, 22 Feb 2013 14:53:56 -0600 Subject: [PATCH] Bug 841566 - Turn on testserver logging for WebRTC-related systems r=jesup,ted.mielczarek --- build/automation.py.in | 8 ++++++++ .../third_party/nICEr/src/stun/stun_server_ctx.c | 6 +++++- .../signaling/src/sipcc/core/ccapp/ccapi_snapshot.c | 2 +- media/webrtc/signaling/src/sipcc/core/common/config_api.c | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/build/automation.py.in b/build/automation.py.in index 005b9ce3751bd..44d0585ac2bc5 100644 --- a/build/automation.py.in +++ b/build/automation.py.in @@ -825,6 +825,14 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t env['XRE_NO_WINDOWS_CRASH_DIALOG'] = '1' env['NS_TRACE_MALLOC_DISABLE_STACKS'] = '1' + # Additional temporary logging while we try to debug some intermittent + # WebRTC conditions. This is necessary to troubleshoot bugs 841496, + # 841150, and 839677 (at least) + env['NSPR_LOG_MODULES'] = 'signaling:3,mtransport:3' + env['R_LOG_LEVEL'] = '5' + env['R_LOG_DESTINATION'] = 'stderr' + env['R_LOG_VERBOSE'] = '1' + # ASan specific environment stuff if self.IS_ASAN and (self.IS_LINUX or self.IS_MAC): try: diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_server_ctx.c b/media/mtransport/third_party/nICEr/src/stun/stun_server_ctx.c index 0efeef052d603..3ae8a5acfcfef 100644 --- a/media/mtransport/third_party/nICEr/src/stun/stun_server_ctx.c +++ b/media/mtransport/third_party/nICEr/src/stun/stun_server_ctx.c @@ -153,7 +153,11 @@ static int nr_stun_server_get_password(void *arg, nr_stun_message *msg, Data **p ABORT(R_NOT_FOUND); } - r_log(NR_LOG_STUN,LOG_NOTICE,"STUN-SERVER(%s): Unable to find password for unknown user: %s",ctx->label,username_attribute->u.username); + /* Although this is an exceptional condition, we'll already have seen a + * NOTICE-level log message about the unknown user, so additional log + * messages at any level higher than DEBUG are unnecessary. */ + + r_log(NR_LOG_STUN,LOG_DEBUG,"STUN-SERVER(%s): Unable to find password for unknown user: %s",ctx->label,username_attribute->u.username); ABORT(R_NOT_FOUND); } diff --git a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_snapshot.c b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_snapshot.c index 11ee155634adf..d177c09706366 100644 --- a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_snapshot.c +++ b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_snapshot.c @@ -30,7 +30,7 @@ cc_string_t lineLabels[MAX_CONFIG_LINES+1] = {0}; void ccsnap_set_line_label(int btn, cc_string_t label) { - CCAPP_ERROR(DEB_F_PREFIX"btn=%d label=%s\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, "ccsnap_set_line_label"), btn, label); + CCAPP_DEBUG(DEB_F_PREFIX"btn=%d label=%s\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, "ccsnap_set_line_label"), btn, label); if ( btn > 0 && btn <= MAX_CONFIG_LINES+1 ) { if ( label == NULL ) { label = strlib_empty(); diff --git a/media/webrtc/signaling/src/sipcc/core/common/config_api.c b/media/webrtc/signaling/src/sipcc/core/common/config_api.c index bd4d87c1cad75..e2b15fd0dbd96 100755 --- a/media/webrtc/signaling/src/sipcc/core/common/config_api.c +++ b/media/webrtc/signaling/src/sipcc/core/common/config_api.c @@ -92,7 +92,7 @@ config_set_string (int id, char *buffer) } } -#define MAX_CONFIG_VAL_PRINT_LEN 256 +#define MAX_CONFIG_VAL_PRINT_LEN 258 /* * Function: print_config_value() *