kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 15:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

REVERT: Add option to suppress the Message channel AMI and ARI events

Browse Source 
This reverts commit bfe9e1b2e7.

Reason for revert: Per discussion on IRC we're sticking to policy.

Change-Id: I61691a9ffa1bc30807cbe618a4a72b4d214481aa
This commit is contained in:
Joshua Colp
2020-02-04 07:35:47 -06:00
committed by George Joseph
parent bfe9e1b2e7
commit 126beb3e6c
6 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configs/samples/asterisk.conf.sample
View File

@@ -118,11 +118,6 @@ documentation_language = en_US ; Set the language you want documentation
; calls are not accepted by a remote ; calls are not accepted by a remote
; implementation, please report this and go ; implementation, please report this and go
; back to value 96. ; back to value 96.
;hide_messaging_ami_events = no; This option, if enabled, will
; suppress all of the Message/ast_msg_queue channel's
; housekeeping AMI and ARI channel events. This can
; reduce the load on the manager and ARI applications
; when the Digium Phone Module for Asterisk is in use.
; Changing the following lines may compromise your security. ; Changing the following lines may compromise your security.
;[files] ;[files]

11
doc/CHANGES-staging/hide_messaging_ami_events
View File

@@ -1,11 +0,0 @@
Subject: Messaging
In order to reduce the amount of AMI and ARI events generated,
the global "Message/ast_msg_queue" channel can be set to suppress
it's normal channel housekeeping events such as "Newexten",
"VarSet", etc. This can greatly reduce load on the manager
and ARI applications when the Digium Phone Module for Asterisk
is in use. To enable, set "hide_messaging_ami_events" in
asterisk.conf to "yes" In Asterisk versions <18, the default
is "no" preserving existing behavior. Beginning with
Asterisk 18, the option will default to "yes".

3
include/asterisk/options.h
View File

@@ -84,8 +84,6 @@ enum ast_option_flags {
AST_OPT_FLAG_DEBUG_MODULE = (1 << 23), AST_OPT_FLAG_DEBUG_MODULE = (1 << 23),
/*! Terminal colors should be adjusted for a light-colored background */ /*! Terminal colors should be adjusted for a light-colored background */
AST_OPT_FLAG_LIGHT_BACKGROUND = (1 << 25), AST_OPT_FLAG_LIGHT_BACKGROUND = (1 << 25),
/*! Make the global Message channel an internal channel to suppress AMI events */
AST_OPT_FLAG_HIDE_MESSAGING_AMI_EVENTS = (1 << 26),
/*! Force black background */ /*! Force black background */
AST_OPT_FLAG_FORCE_BLACK_BACKGROUND = (1 << 27), AST_OPT_FLAG_FORCE_BLACK_BACKGROUND = (1 << 27),
/*! Hide remote console connect messages on console */ /*! Hide remote console connect messages on console */
@@ -131,7 +129,6 @@ enum ast_option_flags {
#define ast_opt_generic_plc ast_test_flag(&ast_options, AST_OPT_FLAG_GENERIC_PLC) #define ast_opt_generic_plc ast_test_flag(&ast_options, AST_OPT_FLAG_GENERIC_PLC)
#define ast_opt_ref_debug ast_test_flag(&ast_options, AST_OPT_FLAG_REF_DEBUG) #define ast_opt_ref_debug ast_test_flag(&ast_options, AST_OPT_FLAG_REF_DEBUG)
#define ast_opt_generic_plc_on_equal_codecs ast_test_flag(&ast_options, AST_OPT_FLAG_GENERIC_PLC_ON_EQUAL_CODECS) #define ast_opt_generic_plc_on_equal_codecs ast_test_flag(&ast_options, AST_OPT_FLAG_GENERIC_PLC_ON_EQUAL_CODECS)
#define ast_opt_hide_messaging_ami_events ast_test_flag(&ast_options, AST_OPT_FLAG_HIDE_MESSAGING_AMI_EVENTS)
/*! Maximum log level defined by PJPROJECT. */ /*! Maximum log level defined by PJPROJECT. */
#define MAX_PJ_LOG_MAX_LEVEL 6 #define MAX_PJ_LOG_MAX_LEVEL 6

1
main/asterisk.c
View File

@@ -506,7 +506,6 @@ static char *handle_show_settings(struct ast_cli_entry *e, int cmd, struct ast_c
ast_cli(a->fd, " Transmit silence during rec: %s\n", ast_test_flag(&ast_options, AST_OPT_FLAG_TRANSMIT_SILENCE) ? "Enabled" : "Disabled"); ast_cli(a->fd, " Transmit silence during rec: %s\n", ast_test_flag(&ast_options, AST_OPT_FLAG_TRANSMIT_SILENCE) ? "Enabled" : "Disabled");
ast_cli(a->fd, " Generic PLC: %s\n", ast_test_flag(&ast_options, AST_OPT_FLAG_GENERIC_PLC) ? "Enabled" : "Disabled"); ast_cli(a->fd, " Generic PLC: %s\n", ast_test_flag(&ast_options, AST_OPT_FLAG_GENERIC_PLC) ? "Enabled" : "Disabled");
ast_cli(a->fd, " Generic PLC on equal codecs: %s\n", ast_test_flag(&ast_options, AST_OPT_FLAG_GENERIC_PLC_ON_EQUAL_CODECS) ? "Enabled" : "Disabled"); ast_cli(a->fd, " Generic PLC on equal codecs: %s\n", ast_test_flag(&ast_options, AST_OPT_FLAG_GENERIC_PLC_ON_EQUAL_CODECS) ? "Enabled" : "Disabled");
ast_cli(a->fd, " Hide Msg Chan AMI events: %s\n", ast_opt_hide_messaging_ami_events ? "Enabled" : "Disabled");
ast_cli(a->fd, " Min DTMF duration:: %u\n", option_dtmfminduration); ast_cli(a->fd, " Min DTMF duration:: %u\n", option_dtmfminduration);
#if !defined(LOW_MEMORY) #if !defined(LOW_MEMORY)
ast_cli(a->fd, " Cache media frames: %s\n", ast_opt_cache_media_frames ? "Enabled" : "Disabled"); ast_cli(a->fd, " Cache media frames: %s\n", ast_opt_cache_media_frames ? "Enabled" : "Disabled");

6
main/message.c
View File

@@ -283,7 +283,7 @@ static int chan_msg_send_digit_end(struct ast_channel *chan, char digit,
* This will not be registered as we never want anything to try * This will not be registered as we never want anything to try
* to create Message channels other than internally in this file. * to create Message channels other than internally in this file.
*/ */
static struct ast_channel_tech msg_chan_tech_hack = { static const struct ast_channel_tech msg_chan_tech_hack = {
.type = "Message", .type = "Message",
.description = "Internal Text Message Processing", .description = "Internal Text Message Processing",
.read = chan_msg_read, .read = chan_msg_read,
@@ -685,10 +685,6 @@ static struct ast_channel *create_msg_q_chan(void)
return NULL; return NULL;
} }
if (ast_opt_hide_messaging_ami_events) {
msg_chan_tech_hack.properties |= AST_CHAN_TP_INTERNAL;
}
ast_channel_tech_set(chan, &msg_chan_tech_hack); ast_channel_tech_set(chan, &msg_chan_tech_hack);
ast_channel_unlock(chan); ast_channel_unlock(chan);
ast_channel_unlink(chan); ast_channel_unlink(chan);

2
main/options.c
View File

@@ -464,8 +464,6 @@ void load_asterisk_conf(void)
} }
} else if (!strcasecmp(v->name, "live_dangerously")) { } else if (!strcasecmp(v->name, "live_dangerously")) {
live_dangerously = ast_true(v->value); live_dangerously = ast_true(v->value);
} else if (!strcasecmp(v->name, "hide_messaging_ami_events")) {
ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_HIDE_MESSAGING_AMI_EVENTS);
} }
} }
if (!ast_opt_remote) { if (!ast_opt_remote) {