From e22d3f5cb2791b70a9fcfe6befdeca233772688d Mon Sep 17 00:00:00 2001 From: spag Date: Tue, 5 Feb 2013 14:30:30 +0100 Subject: preserve event consumer --- misc/freeswitch/scripts/event/event.lua | 6 ++++-- misc/freeswitch/scripts/event_manager.lua | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'misc/freeswitch') diff --git a/misc/freeswitch/scripts/event/event.lua b/misc/freeswitch/scripts/event/event.lua index c98b534..652fc48 100644 --- a/misc/freeswitch/scripts/event/event.lua +++ b/misc/freeswitch/scripts/event/event.lua @@ -16,13 +16,16 @@ function EventManager.new(self, arg) self.class = 'eventmanager' self.database = arg.database; self.domain = arg.domain; + self.consumer = arg.consumer; return object; end function EventManager.register(self) - self.consumer = freeswitch.EventConsumer('all'); + if not self.consumer then + self.consumer = freeswitch.EventConsumer('all'); + end return (self.consumer ~= nil); end @@ -117,6 +120,5 @@ function EventManager.run(self) end end - self.consumer = nil; self.log:info('[event] EVENT_MANAGER_EXIT - action: ', freeswitch.getGlobalVariable('gs_event_manager')); end diff --git a/misc/freeswitch/scripts/event_manager.lua b/misc/freeswitch/scripts/event_manager.lua index 3d558e5..3991f8f 100644 --- a/misc/freeswitch/scripts/event_manager.lua +++ b/misc/freeswitch/scripts/event_manager.lua @@ -26,13 +26,15 @@ else log:error('[event] EVENT_MANAGER_LOADER - No SIP domains found!'); end +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 } + 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 -- cgit v1.2.3