kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8581 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-05-24 05:09:50 +00:00
parent 0c60b93f57
commit d9bdd7db0b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/switch_loadable_module.c
View File

@ -1354,8 +1354,11 @@ SWITCH_DECLARE(switch_status_t) switch_api_execute(const char *cmd, const char *
} }
} }
if (cmd && (api = switch_loadable_module_get_api_interface(cmd)) != 0) { if (cmd && (api = switch_loadable_module_get_api_interface(cmd)) != 0) {
status = api->function(arg, session, stream); if ((status = api->function(arg, session, stream)) != SWITCH_STATUS_SUCCESS) {
stream->write_function(stream, "COMMAND RETURNED ERROR!\n");
}
} else { } else {
status = SWITCH_STATUS_FALSE; status = SWITCH_STATUS_FALSE;
stream->write_function(stream, "INVALID COMMAND!\n"); stream->write_function(stream, "INVALID COMMAND!\n");

4
src/switch_log.c
View File

@ -268,7 +268,7 @@ SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char
memset(&to, 0, sizeof(to)); memset(&to, 0, sizeof(to));
FD_SET(fd, &can_write); FD_SET(fd, &can_write);
to.tv_sec = 0; to.tv_sec = 0;
to.tv_usec = 5000; to.tv_usec = 100000;
if (select(fd+1, NULL, &can_write, NULL, &to) > 0) { if (select(fd+1, NULL, &can_write, NULL, &to) > 0) {
aok = FD_ISSET(fd, &can_write); aok = FD_ISSET(fd, &can_write);
} else { } else {
@ -298,6 +298,8 @@ SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char
node->level = level; node->level = level;
node->content = content; node->content = content;
node->timestamp = now; node->timestamp = now;
if (switch_queue_trypush(LOG_QUEUE, node) != SWITCH_STATUS_SUCCESS) { if (switch_queue_trypush(LOG_QUEUE, node) != SWITCH_STATUS_SUCCESS) {
free(node->data); free(node->data);
if (switch_queue_trypush(LOG_RECYCLE_QUEUE, node) != SWITCH_STATUS_SUCCESS) { if (switch_queue_trypush(LOG_RECYCLE_QUEUE, node) != SWITCH_STATUS_SUCCESS) {