kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 16:39:14 +00:00
Code Issues Projects Releases Wiki Activity

reduce logging when level is below 9 for less important messages

Browse Source
This commit is contained in:
Nathan Neulinger 2014-11-11 09:11:44 -06:00
parent ab24bde262
commit c79360c596
2 changed files with 62 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/mod/endpoints/mod_skinny/skinny_protocol.c
View File

@ -506,9 +506,11 @@ switch_status_t perform_send_register_ack(listener_t *listener,
message->data.reg_ack.secondary_keep_alive = keep_alive; message->data.reg_ack.secondary_keep_alive = keep_alive;
switch_copy_string(message->data.reg_ack.reserved2, reserved2, 4); switch_copy_string(message->data.reg_ack.reserved2, reserved2, 4);
skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG, if ( listener->profile->debug >= 9 ) {
"Sending Register Ack with Keep Alive (%d), Date Format (%s), Secondary Keep Alive (%d)\n", skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
keep_alive, date_format, secondary_keep_alive); "Sending Register Ack with Keep Alive (%d), Date Format (%s), Secondary Keep Alive (%d)\n",
keep_alive, date_format, secondary_keep_alive);
}
return skinny_send_reply_quiet(listener, message, SWITCH_TRUE); return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
} }
@ -527,9 +529,11 @@ switch_status_t perform_send_speed_dial_stat_res(listener_t *listener,
switch_copy_string(message->data.speed_dial_res.line, speed_line, 24); switch_copy_string(message->data.speed_dial_res.line, speed_line, 24);
switch_copy_string(message->data.speed_dial_res.label, speed_label, 40); switch_copy_string(message->data.speed_dial_res.label, speed_label, 40);
skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG, if ( listener->profile->debug >= 9 ) {
"Sending Speed Dial Stat Res with Number (%d), Line (%s), Label (%s)\n", skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
number, speed_line, speed_label); "Sending Speed Dial Stat Res with Number (%d), Line (%s), Label (%s)\n",
number, speed_line, speed_label);
}
return skinny_send_reply_quiet(listener, message, SWITCH_TRUE); return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
} }
@ -791,8 +795,10 @@ switch_status_t perform_send_call_info(listener_t *listener,
message->data.call_info.call_security_status = call_security_status; message->data.call_info.call_security_status = call_security_status;
message->data.call_info.party_pi_restriction_bits = party_pi_restriction_bits; message->data.call_info.party_pi_restriction_bits = party_pi_restriction_bits;
skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG, if ( listener->profile->debug >= 9 ) {
"Send Call Info with Line Instance (%d)...\n", line_instance); skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
"Send Call Info with Line Instance (%d)...\n", line_instance);
}
return skinny_send_reply_quiet(listener, message, SWITCH_TRUE); return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
} }
@ -823,9 +829,11 @@ switch_status_t perform_send_define_time_date(listener_t *listener,
message->data.define_time_date.milliseconds = milliseconds; message->data.define_time_date.milliseconds = milliseconds;
message->data.define_time_date.timestamp = timestamp; message->data.define_time_date.timestamp = timestamp;
skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG, if ( listener->profile->debug >= 9 ) {
"Send Define Time Date with %.4d-%.2d-%.2d %.2d:%.2d:%.2d.%d, Timestamp (%d), DOW (%d)\n", skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
year, month, day, hour, minute, seconds, milliseconds, timestamp, day_of_week); "Send Define Time Date with %.4d-%.2d-%.2d %.2d:%.2d:%.2d.%d, Timestamp (%d), DOW (%d)\n",
year, month, day, hour, minute, seconds, milliseconds, timestamp, day_of_week);
}
return skinny_send_reply_quiet(listener, message, SWITCH_TRUE); return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
} }
@ -857,8 +865,10 @@ switch_status_t perform_send_capabilities_req(listener_t *listener,
skinny_create_empty_message(message, CAPABILITIES_REQ_MESSAGE); skinny_create_empty_message(message, CAPABILITIES_REQ_MESSAGE);
skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG, if ( listener->profile->debug >= 9 ) {
"Send Capabilities Req%s\n", ""); skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
"Send Capabilities Req%s\n", "");
}
return skinny_send_reply_quiet(listener, message, SWITCH_TRUE); return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
} }
@ -873,8 +883,10 @@ switch_status_t perform_send_version(listener_t *listener,
memcpy(message->data.version.version, version, 16); memcpy(message->data.version.version, version, 16);
skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG, if ( listener->profile->debug >= 9 ) {
"Send Version with Version(%s)\n", version); skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
"Send Version with Version(%s)\n", version);
}
return skinny_send_reply_quiet(listener, message, SWITCH_TRUE); return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
} }
@ -973,9 +985,11 @@ switch_status_t perform_send_select_soft_keys(listener_t *listener,
message->data.select_soft_keys.soft_key_set = soft_key_set; message->data.select_soft_keys.soft_key_set = soft_key_set;
message->data.select_soft_keys.valid_key_mask = valid_key_mask; message->data.select_soft_keys.valid_key_mask = valid_key_mask;
skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG, if ( listener->profile->debug >= 9 ) {
"Send Select Soft Keys with Line Instance (%d), Call ID (%d), Soft Key Set (%d), Valid Key Mask (%x)\n", skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
"Send Select Soft Keys with Line Instance (%d), Call ID (%d), Soft Key Set (%d), Valid Key Mask (%x)\n",
line_instance, call_id, soft_key_set, valid_key_mask); line_instance, call_id, soft_key_set, valid_key_mask);
}
return skinny_send_reply_quiet(listener, message, SWITCH_TRUE); return skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
} }
@ -1299,7 +1313,8 @@ switch_status_t skinny_perform_send_reply(listener_t *listener, const char *file
ptr = (char *) reply; ptr = (char *) reply;
if (listener_is_ready(listener)) { if (listener_is_ready(listener)) {
if (listener->profile->debug >= 10 || reply->type != KEEP_ALIVE_ACK_MESSAGE) { if (listener->profile->debug >= 10 ||
(listener->profile->debug >= 9 && reply->type != KEEP_ALIVE_ACK_MESSAGE)) {
skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG, skinny_log_l_ffl(listener, file, func, line, SWITCH_LOG_DEBUG,
"Sending %s (type=%x,length=%d).\n", "Sending %s (type=%x,length=%d).\n",
skinny_message_type2str(reply->type), reply->type, reply->length); skinny_message_type2str(reply->type), reply->type, reply->length);

41
src/mod/endpoints/mod_skinny/skinny_server.c
View File

@ -1621,8 +1621,10 @@ switch_status_t skinny_handle_forward_stat_req_message(listener_t *listener, ski
message->data.forward_stat.line_instance = request->data.forward_stat_req.line_instance; message->data.forward_stat.line_instance = request->data.forward_stat_req.line_instance;
skinny_log_l(listener, SWITCH_LOG_DEBUG, "Handle Forward Stat Req Message with Line Instance (%d)\n", if ( listener->profile->debug >= 9 ) {
request->data.forward_stat_req.line_instance); skinny_log_l(listener, SWITCH_LOG_DEBUG, "Handle Forward Stat Req Message with Line Instance (%d)\n",
request->data.forward_stat_req.line_instance);
}
skinny_send_reply_quiet(listener, message, SWITCH_TRUE); skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
@ -1634,7 +1636,9 @@ switch_status_t skinny_handle_speed_dial_stat_request(listener_t *listener, skin
skinny_check_data_length(request, sizeof(request->data.speed_dial_req)); skinny_check_data_length(request, sizeof(request->data.speed_dial_req));
skinny_log_l(listener, SWITCH_LOG_DEBUG, "Handle Speed Dial Stat Request for Number (%d)\n", request->data.speed_dial_req.number); if ( listener->profile->debug >= 9 ) {
skinny_log_l(listener, SWITCH_LOG_DEBUG, "Handle Speed Dial Stat Request for Number (%d)\n", request->data.speed_dial_req.number);
}
skinny_speed_dial_get(listener, request->data.speed_dial_req.number, &button); skinny_speed_dial_get(listener, request->data.speed_dial_req.number, &button);
@ -1906,7 +1910,9 @@ switch_status_t skinny_handle_capabilities_response(listener_t *listener, skinny
skinny_execute_sql(profile, sql, profile->sql_mutex); skinny_execute_sql(profile, sql, profile->sql_mutex);
switch_safe_free(sql); switch_safe_free(sql);
} }
skinny_log_l(listener, SWITCH_LOG_DEBUG, "Codecs %s supported.\n", codec_string); if ( listener->profile->debug >= 9 ) {
skinny_log_l(listener, SWITCH_LOG_DEBUG, "Codecs %s supported.\n", codec_string);
}
switch_safe_free(codec_string); switch_safe_free(codec_string);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
@ -2036,11 +2042,15 @@ switch_status_t skinny_handle_soft_key_set_request(listener_t *listener, skinny_
if (listener->soft_key_set_set) { if (listener->soft_key_set_set) {
message = switch_core_hash_find(listener->profile->soft_key_set_sets_hash, listener->soft_key_set_set); message = switch_core_hash_find(listener->profile->soft_key_set_sets_hash, listener->soft_key_set_set);
skinny_log_l(listener, SWITCH_LOG_DEBUG, "Handle Soft Key Set Request with Set (%s)\n", listener->soft_key_set_set); if ( listener->profile->debug >= 9 ) {
skinny_log_l(listener, SWITCH_LOG_DEBUG, "Handle Soft Key Set Request with Set (%s)\n", listener->soft_key_set_set);
}
} }
if (!message) { if (!message) {
message = switch_core_hash_find(listener->profile->soft_key_set_sets_hash, "default"); message = switch_core_hash_find(listener->profile->soft_key_set_sets_hash, "default");
skinny_log_l(listener, SWITCH_LOG_DEBUG, "Handle Soft Key Set Request with Set (%s)\n", "default"); if ( listener->profile->debug >= 9 ) {
skinny_log_l(listener, SWITCH_LOG_DEBUG, "Handle Soft Key Set Request with Set (%s)\n", "default");
}
} }
if (message) { if (message) {
skinny_send_reply_quiet(listener, message, SWITCH_FALSE); skinny_send_reply_quiet(listener, message, SWITCH_FALSE);
@ -2231,7 +2241,9 @@ switch_status_t skinny_handle_soft_key_template_request(listener_t *listener, sk
message->data.soft_key_template.soft_key[i].soft_key_event = soft_key_template_default_events[i]; message->data.soft_key_template.soft_key[i].soft_key_event = soft_key_template_default_events[i];
} }
skinny_log_l_msg(listener, SWITCH_LOG_DEBUG, "Handle Soft Key Template Request with Default Template\n"); if ( listener->profile->debug >= 9 ) {
skinny_log_l_msg(listener, SWITCH_LOG_DEBUG, "Handle Soft Key Template Request with Default Template\n");
}
skinny_send_reply_quiet(listener, message, SWITCH_TRUE); skinny_send_reply_quiet(listener, message, SWITCH_TRUE);
@ -2254,8 +2266,10 @@ switch_status_t skinny_headset_status_message(listener_t *listener, skinny_messa
switch_safe_free(sql); switch_safe_free(sql);
} }
skinny_log_l(listener, SWITCH_LOG_DEBUG, "Update headset accessory status (%s)\n", if ( listener->profile->debug >= 9 ) {
skinny_accessory_state2str(request->data.headset_status.mode)); skinny_log_l(listener, SWITCH_LOG_DEBUG, "Update headset accessory status (%s)\n",
skinny_accessory_state2str(request->data.headset_status.mode));
}
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
@ -2274,7 +2288,9 @@ switch_status_t skinny_handle_register_available_lines_message(listener_t *liste
{ {
skinny_check_data_length(request, sizeof(request->data.reg_lines)); skinny_check_data_length(request, sizeof(request->data.reg_lines));
skinny_log_l_msg(listener, SWITCH_LOG_DEBUG, "Handle Register Available Lines\n"); if ( listener->profile->debug >= 9 ) {
skinny_log_l_msg(listener, SWITCH_LOG_DEBUG, "Handle Register Available Lines\n");
}
/* Do nothing */ /* Do nothing */
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
@ -2531,7 +2547,7 @@ switch_status_t skinny_handle_xml_alarm(listener_t *listener, skinny_message_t *
switch_event_t *event = NULL; switch_event_t *event = NULL;
char *tmp = NULL; char *tmp = NULL;
skinny_log_l(listener, SWITCH_LOG_INFO, "Received XML alarm (length=%d).\n", request->length); skinny_log_l(listener, SWITCH_LOG_DEBUG, "Received XML alarm (length=%d).\n", request->length);
/* skinny::xml_alarm event */ /* skinny::xml_alarm event */
skinny_device_event(listener, &event, SWITCH_EVENT_CUSTOM, SKINNY_EVENT_XML_ALARM); skinny_device_event(listener, &event, SWITCH_EVENT_CUSTOM, SKINNY_EVENT_XML_ALARM);
/* Ensure that the body is null-terminated */ /* Ensure that the body is null-terminated */
@ -2547,7 +2563,8 @@ switch_status_t skinny_handle_xml_alarm(listener_t *listener, skinny_message_t *
switch_status_t skinny_handle_request(listener_t *listener, skinny_message_t *request) switch_status_t skinny_handle_request(listener_t *listener, skinny_message_t *request)
{ {
if (listener->profile->debug >= 10 || request->type != KEEP_ALIVE_MESSAGE) { if (listener->profile->debug >= 10 ||
(listener->profile->debug >= 9 && request->type != KEEP_ALIVE_MESSAGE)) {
skinny_log_l(listener, SWITCH_LOG_DEBUG, "Received %s (type=%x,length=%d).\n", skinny_log_l(listener, SWITCH_LOG_DEBUG, "Received %s (type=%x,length=%d).\n",
skinny_message_type2str(request->type), request->type, request->length); skinny_message_type2str(request->type), request->type, request->length);
} }