summaryrefslogtreecommitdiff
path: root/main/stasis.c
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2013-10-02 22:22:17 +0000
committerMark Michelson <mmichelson@digium.com>2013-10-02 22:22:17 +0000
commitaddbf276f5037dc5a265a1e43e383ae1d9e9d0d8 (patch)
tree0d9c84e9baffd708576d6c79fcd8adf768cba77d /main/stasis.c
parente4ed9886e6527cab3858f45e8ba2d5f11a9aed08 (diff)
Multiple revisions 400318-400319
........ r400318 | mmichelson | 2013-10-02 17:08:49 -0500 (Wed, 02 Oct 2013) | 12 lines Remove unnecessary waits from stasis. Since caches are updated on publisher threads, there is no need to wait for the cache updates to occur after a stasis message is published. In the case of chan_pjsip device state changes, this set of changes caused an improvement to performance. Review: https://reviewboard.asterisk.org/r/2890 ........ r400319 | mmichelson | 2013-10-02 17:10:54 -0500 (Wed, 02 Oct 2013) | 3 lines Remove svn:mergeinfo property. ........ Merged revisions 400318-400319 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@400335 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/stasis.c')
-rw-r--r--main/stasis.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/main/stasis.c b/main/stasis.c
index 42c901769..eabdfdc1c 100644
--- a/main/stasis.c
+++ b/main/stasis.c
@@ -814,11 +814,6 @@ int stasis_init(void)
/* Be sure the types are cleaned up after the message bus */
ast_register_cleanup(stasis_cleanup);
- if (stasis_wait_init() != 0) {
- ast_log(LOG_ERROR, "Stasis initialization failed\n");
- return -1;
- }
-
cache_init = stasis_cache_init();
if (cache_init != 0) {
return -1;