kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

devicestate: Don't create topic when change isn't cached.

Browse Source 
When publishing a device state the change can be marked as being
cachable or not. If it is not cached the change is just published
to all interested and not stored away for later query. This was not
fully taken into account when publishing in stasis. The act of
publishing would create a topic for the device even if it may be
ephemeral.

This change makes it so messages which are not cached won't create
a topic for the device. If a topic does already exist it will be
published to but otherwise the change will only be published to
the device state all topic.

ASTERISK-27591

Change-Id: I18da0e8cbb18e79602e731020c46ba4101e59f0a
This commit is contained in:
Joshua Colp
2018-07-25 10:32:31 +00:00
parent 1c8e6ecca3
commit 66f581313f
3 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
main/devicestate.c
View File

@@ -714,7 +714,7 @@ int ast_publish_device_state_full(
{
RAII_VAR(struct ast_device_state_message *, device_state, NULL, ao2_cleanup);
RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup);
struct stasis_topic *device_specific_topic;
struct stasis_topic *topic;
ast_assert(!ast_strlen_zero(device));
@@ -733,12 +733,28 @@ int ast_publish_device_state_full(
return -1;
}
device_specific_topic = ast_device_state_topic(device);
if (!device_specific_topic) {
/* When a device state is to be cached it is likely that something
* external will either be monitoring it or will want to pull the
* information from the cache, so we always publish to the device
* specific topic. Cachable updates traditionally come from such things
* as a SIP or PJSIP device.
* When a device state is not to be cached we only publish to its
* specific topic if something has already created the topic. Publishing
* to its topic otherwise would create the topic, which may not be
* necessary as it could be an ephemeral device. Uncachable updates
* traditionally come from such things as Local channels.
*/
if (cachable || stasis_topic_pool_topic_exists(device_state_topic_pool, device)) {
topic = ast_device_state_topic(device);
} else {
topic = ast_device_state_topic_all();
}
if (!topic) {
return -1;
}
stasis_publish(device_specific_topic, message);
stasis_publish(topic, message);
return 0;
}