kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-02-13 13:40:44 +00:00
Code Issues Projects Releases Wiki Activity

FS-5914 --resolve

Browse Source
This commit is contained in:
Marc Olivier Chouinard 2014-02-24 20:37:10 -05:00
parent 9f98ccc105
commit 7c440105ac
1 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c
View File

@ -64,6 +64,7 @@ static struct {
uint32_t enable_ssl_verifyhost; uint32_t enable_ssl_verifyhost;
int encode; int encode;
int log_http_and_disk; int log_http_and_disk;
switch_bool_t log_errors_to_disk;
int log_b; int log_b;
int prefix_a; int prefix_a;
int disable100continue; int disable100continue;
@ -386,36 +387,40 @@ static switch_status_t my_on_reporting(switch_core_session_t *session)
curl_handle = NULL; curl_handle = NULL;
/* if we are here the web post failed for some reason */ /* if we are here the web post failed for some reason */
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to post to web server, writing to file\n"); if (globals.log_errors_to_disk) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to post to web server, writing to file\n");
for (err_dir_index = 0; err_dir_index < globals.err_dir_count; err_dir_index++) { for (err_dir_index = 0; err_dir_index < globals.err_dir_count; err_dir_index++) {
switch_thread_rwlock_rdlock(globals.log_path_lock); switch_thread_rwlock_rdlock(globals.log_path_lock);
path = switch_mprintf("%s%s%s%s.cdr.json", globals.err_log_dir[err_dir_index], SWITCH_PATH_SEPARATOR, a_prefix, switch_core_session_get_uuid(session)); path = switch_mprintf("%s%s%s%s.cdr.json", globals.err_log_dir[err_dir_index], SWITCH_PATH_SEPARATOR, a_prefix, switch_core_session_get_uuid(session));
switch_thread_rwlock_unlock(globals.log_path_lock); switch_thread_rwlock_unlock(globals.log_path_lock);
if (path) { if (path) {
#ifdef _MSC_VER #ifdef _MSC_VER
if ((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { if ((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) {
#else #else
if ((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)) > -1) { if ((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)) > -1) {
#endif #endif
int wrote; int wrote;
wrote = write(fd, json_text, (unsigned) strlen(json_text)); wrote = write(fd, json_text, (unsigned) strlen(json_text));
close(fd); close(fd);
fd = -1; fd = -1;
if(wrote < 0) { if(wrote < 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error writing [%s]\n",path); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error writing [%s]\n",path);
}
break;
} else {
char ebuf[512] = { 0 };
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open %s! [%s]\n",
path, switch_strerror_r(errno, ebuf, sizeof(ebuf)));
}
switch_safe_free(path);
} }
break;
} else {
char ebuf[512] = { 0 };
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open %s! [%s]\n",
path, switch_strerror_r(errno, ebuf, sizeof(ebuf)));
} }
} else {
switch_safe_free(path); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to post to web server, not writing to file\n");
} }
}
} }
success: success:
status = SWITCH_STATUS_SUCCESS; status = SWITCH_STATUS_SUCCESS;
@ -484,6 +489,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_json_cdr_load)
} }
globals.log_http_and_disk = 0; globals.log_http_and_disk = 0;
globals.log_errors_to_disk = SWITCH_TRUE;
globals.log_b = 1; globals.log_b = 1;
globals.disable100continue = 0; globals.disable100continue = 0;
globals.pool = pool; globals.pool = pool;
@ -513,6 +519,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_json_cdr_load)
} }
} else if (!strcasecmp(var, "log-http-and-disk")) { } else if (!strcasecmp(var, "log-http-and-disk")) {
globals.log_http_and_disk = switch_true(val); globals.log_http_and_disk = switch_true(val);
} else if (!strcasecmp(var, "log-errors-to-disk")) {
globals.log_errors_to_disk = !switch_false(val);
} else if (!strcasecmp(var, "delay") && !zstr(val)) { } else if (!strcasecmp(var, "delay") && !zstr(val)) {
globals.delay = (uint32_t) atoi(val); globals.delay = (uint32_t) atoi(val);
} else if (!strcasecmp(var, "log-b-leg")) { } else if (!strcasecmp(var, "log-b-leg")) {