diff options
| author | Kinsey Moore <kmoore@digium.com> | 2014-08-06 12:55:28 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2014-08-06 12:55:28 +0000 |
| commit | f1036f40dc22c4d4b30cc2ab36199cd749ead9c5 (patch) | |
| tree | 4fd17b406cb14b5eee97cf0be44382b792ccbff9 /main/cdr.c | |
| parent | ac5c75b45d9d7fe047ccd9d1d094cb9d30df8b51 (diff) | |
Stasis: Allow message types to be blocked
This introduces stasis.conf and a mechanism to prevent certain message
types from being published. Internally, this works by preventing the
chosen message types from being created which ensures that those
message types can never be published. This patch also adjusts message
publishers such that message payloads are not created if the related
message type is not available.
ASTERISK-23943 #close
Review: https://reviewboard.asterisk.org/r/3823/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@420124 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/cdr.c')
| -rw-r--r-- | main/cdr.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/main/cdr.c b/main/cdr.c index 17fa8a25f..2aaef8862 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -4198,7 +4198,7 @@ int ast_cdr_engine_init(void) void ast_cdr_engine_term(void) { RAII_VAR(struct module_config *, mod_cfg, ao2_global_obj_ref(module_configs), ao2_cleanup); - RAII_VAR(void *, payload, ao2_alloc(sizeof(*payload), NULL), ao2_cleanup); + RAII_VAR(void *, payload, NULL, ao2_cleanup); RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup); /* Since this is called explicitly during process shutdown, we might not have ever @@ -4208,16 +4208,19 @@ void ast_cdr_engine_term(void) return; } - /* Make sure we have the needed items */ - if (!stasis_router || !payload) { - return; - } + if (cdr_sync_message_type()) { + /* Make sure we have the needed items */ + payload = ao2_alloc(sizeof(*payload), NULL); + if (!stasis_router || !payload) { + return; + } - ast_debug(1, "CDR Engine termination request received; waiting on messages...\n"); + ast_debug(1, "CDR Engine termination request received; waiting on messages...\n"); - message = stasis_message_create(cdr_sync_message_type(), payload); - if (message) { - stasis_message_router_publish_sync(stasis_router, message); + message = stasis_message_create(cdr_sync_message_type(), payload); + if (message) { + stasis_message_router_publish_sync(stasis_router, message); + } } if (ast_test_flag(&mod_cfg->general->settings, CDR_BATCHMODE)) { |