Release a new beta.5.1-beta4

1 files changed, 14 insertions, 7 deletions

diff --git a/misc/freeswitch/scripts/event_manager.lua b/misc/freeswitch/scripts/event_manager.lua
index 1e61baf..3991f8f 100644
--- a/misc/freeswitch/scripts/event_manager.lua
+++ b/misc/freeswitch/scripts/event_manager.lua
@@ -7,12 +7,12 @@ require "common.log"
 local log = common.log.Log:new()
 log.prefix = "#E# "
 
-log:info('[event] EVENT_MANAGER start');
+log:info('[event] EVENT_MANAGER_LOADER start');
 
 require 'common.database'
 local database = common.database.Database:new{ log = log }:connect();
 if not database:connected() then
-  log:error('[event] EVENT_MANAGER - cannot connect to Gemeinschaft database');
+  log:error('[event] EVENT_MANAGER_LOADER - cannot connect to Gemeinschaft database');
   return;
 end
 
@@ -23,16 +23,23 @@ local domain = '127.0.0.1';
 if domains[1] then
   domain = domains[1]['host'];
 else
-  log:error('[event] EVENT_MANAGER - No SIP domains found!');
+  log:error('[event] EVENT_MANAGER_LOADER - No SIP domains found!');
 end
 
-require 'event.event'
-local event_manager = event.event.EventManager:new{ log = log, database = database, domain = domain }
-event_manager:run();
+local event_consumer = nil;
+freeswitch.setGlobalVariable('gs_event_manager', 'true');
+while freeswitch.getGlobalVariable('gs_event_manager') ~= 'false' do
+  package.loaded['event.event'] = nil;
+  local manager_class = require('event.event');
+  local event_manager = manager_class.EventManager:new{ log = log, database = database, domain = domain, consumer = event_consumer };
+  freeswitch.setGlobalVariable('gs_event_manager', 'true');
+  event_manager:run();
+  event_consumer = event_manager.consumer;
+end
 
 -- ensure database handle is released on exit
 if database then
   database:release();
 end
 
-log:info('[event] EVENT_MANAGER exit');
+log:info('[event] EVENT_MANAGER_LOADER exit');