add fsctl shutdown [elegant|restart] <- one or both keywords

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9788 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2008-10-02 16:46:20 +00:00
parent 3c2699ec2a
commit f23c88d9fa
4 changed files with 54 additions and 8 deletions

View File

@@ -1304,8 +1304,28 @@ SWITCH_DECLARE(int32_t) switch_core_session_ctl(switch_session_ctl_t cmd, int32_
case SCSC_HUPALL:
switch_core_session_hupall(SWITCH_CAUSE_MANAGER_REQUEST);
break;
case SCSC_SHUTDOWN_ELEGANT:
{
int x = 19;
if (*val) {
switch_set_flag((&runtime), SCF_RESTART);
}
switch_set_flag((&runtime), SCF_NO_NEW_SESSIONS);
while(runtime.running && switch_core_session_count()) {
switch_yield(500000);
if (++x == 20) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Shutdown in progress.....\n");
x = 0;
}
}
runtime.running = 0;
}
break;
case SCSC_SHUTDOWN:
runtime.running = 0;
if (*val) {
switch_set_flag((&runtime), SCF_RESTART);
}
break;
case SCSC_CHECK_RUNNING:
*val = runtime.running;
@@ -1347,6 +1367,7 @@ SWITCH_DECLARE(int32_t) switch_core_session_ctl(switch_session_ctl_t cmd, int32_
break;
}
return 0;
}
@@ -1412,8 +1433,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(void)
apr_pool_destroy(runtime.memory_pool);
/* apr_terminate(); */
}
return SWITCH_STATUS_SUCCESS;
return switch_test_flag((&runtime), SCF_RESTART) ? SWITCH_STATUS_RESTART : SWITCH_STATUS_SUCCESS;
}
SWITCH_DECLARE(switch_status_t) switch_core_management_exec(char *relative_oid, switch_management_action_t action, char *data, switch_size_t datalen)