From 0bcfdbe6ca610ad19e271014927449513839fcd5 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 16 Aug 2011 11:03:29 -0500 Subject: [PATCH] only do the 10 second pause, not the reduction in max_sessions when the event system overloads --- src/mod/endpoints/mod_sofia/mod_sofia.h | 2 +- src/switch_event.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h index 190212a22b..ec3f9a7889 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.h +++ b/src/mod/endpoints/mod_sofia/mod_sofia.h @@ -33,7 +33,7 @@ * mod_sofia.h -- SOFIA SIP Endpoint * */ - +#define HAVE_MEMLEAK_LOG 1 /*Defines etc..*/ /*************************************************************************************************************************************************************/ #define MANUAL_BYE 1 diff --git a/src/switch_event.c b/src/switch_event.c index b469b9f7b7..8265a18207 100644 --- a/src/switch_event.c +++ b/src/switch_event.c @@ -333,17 +333,11 @@ static void *SWITCH_THREAD_FUNC switch_event_thread(switch_thread_t *thread, voi if (++loops > 2) { - uint32_t last_sps = 0, sess_count = switch_core_session_count(); if (auto_pause) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Event system *still* overloading.\n"); } else { - switch_core_session_ctl(SCSC_LAST_SPS, &last_sps); - last_sps = (uint32_t) (float) (last_sps * 0.75f); - sess_count = (uint32_t) (float) (sess_count * 0.75f); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, - "Event system overloading. Taking a 10 second break, Reducing max_sessions to %d %dsps\n", sess_count, last_sps); - switch_core_session_limit(sess_count); - switch_core_session_ctl(SCSC_SPS, &last_sps); + "Event system overloading. Taking a 10 second break\n"); auto_pause = 10; switch_core_session_ctl(SCSC_PAUSE_INBOUND, &auto_pause); }