Committed by
Gerrit Code Review
GUI - Fixed a timing issue with topology event handler binding.
- handlers were not bound up front, (but during a delayed promise callback) - resulted in the handlers not being present for initial events returned from the server: -- showSummary, spriteListResponse, spriteDataResponse Change-Id: Ida8d14e8bdcb065d0ea5f88eb7a4bf6e45036c27
Showing
2 changed files
with
12 additions
and
4 deletions
... | @@ -28,9 +28,9 @@ | ... | @@ -28,9 +28,9 @@ |
28 | 'onosRemote' | 28 | 'onosRemote' |
29 | ]; | 29 | ]; |
30 | 30 | ||
31 | - // references to injected services etc. | 31 | + // references to injected services |
32 | var $scope, $log, $cookies, fs, ks, zs, gs, ms, sus, flash, wss, ps, th, | 32 | var $scope, $log, $cookies, fs, ks, zs, gs, ms, sus, flash, wss, ps, th, |
33 | - tds, tes, tfs, tps, tis, tss, tls, tts, tos, fltr, ttbs, ttip, tov; | 33 | + tds, tes, tfs, tps, tis, tss, tls, tts, tos, fltr, ttbs, tspr, ttip, tov; |
34 | 34 | ||
35 | // DOM elements | 35 | // DOM elements |
36 | var ovtopo, svg, defs, zoomLayer, mapG, spriteG, forceG, noDevsLayer; | 36 | var ovtopo, svg, defs, zoomLayer, mapG, spriteG, forceG, noDevsLayer; |
... | @@ -507,7 +507,7 @@ | ... | @@ -507,7 +507,7 @@ |
507 | _zs_, _gs_, _ms_, _sus_, _flash_, _wss_, _ps_, _th_, | 507 | _zs_, _gs_, _ms_, _sus_, _flash_, _wss_, _ps_, _th_, |
508 | _tds_, _tes_, | 508 | _tds_, _tes_, |
509 | _tfs_, _tps_, _tis_, _tss_, _tls_, _tts_, _tos_, _fltr_, | 509 | _tfs_, _tps_, _tis_, _tss_, _tls_, _tts_, _tos_, _fltr_, |
510 | - _ttbs_, tspr, _ttip_, _tov_) { | 510 | + _ttbs_, _tspr_, _ttip_, _tov_) { |
511 | var params = $loc.search(), | 511 | var params = $loc.search(), |
512 | projection, | 512 | projection, |
513 | dim, | 513 | dim, |
... | @@ -548,6 +548,7 @@ | ... | @@ -548,6 +548,7 @@ |
548 | tos = _tos_; | 548 | tos = _tos_; |
549 | fltr = _fltr_; | 549 | fltr = _fltr_; |
550 | ttbs = _ttbs_; | 550 | ttbs = _ttbs_; |
551 | + tspr = _tspr_; | ||
551 | ttip = _ttip_; | 552 | ttip = _ttip_; |
552 | tov = _tov_; | 553 | tov = _tov_; |
553 | 554 | ||
... | @@ -609,6 +610,7 @@ | ... | @@ -609,6 +610,7 @@ |
609 | restoreSummaryFromPrefs(); | 610 | restoreSummaryFromPrefs(); |
610 | } | 611 | } |
611 | ); | 612 | ); |
613 | + tes.bindHandlers(); | ||
612 | setUpSprites($loc, tspr); | 614 | setUpSprites($loc, tspr); |
613 | 615 | ||
614 | forceG = zoomLayer.append('g').attr('id', 'topo-force'); | 616 | forceG = zoomLayer.append('g').attr('id', 'topo-force'); | ... | ... |
... | @@ -109,9 +109,14 @@ | ... | @@ -109,9 +109,14 @@ |
109 | 109 | ||
110 | createHandlerMap(); | 110 | createHandlerMap(); |
111 | 111 | ||
112 | + function bindHandlers() { | ||
113 | + wss.bindHandlers(handlerMap); | ||
114 | + $log.debug('topo event handlers bound'); | ||
115 | + } | ||
116 | + | ||
112 | function start() { | 117 | function start() { |
118 | + // in case we fail over to a new server, listen for wsock-open | ||
113 | openListener = wss.addOpenListener(wsOpen); | 119 | openListener = wss.addOpenListener(wsOpen); |
114 | - wss.bindHandlers(handlerMap); | ||
115 | wss.sendEvent('topoStart'); | 120 | wss.sendEvent('topoStart'); |
116 | scheduleHeartbeat(); | 121 | scheduleHeartbeat(); |
117 | $log.debug('topo comms started'); | 122 | $log.debug('topo comms started'); |
... | @@ -127,6 +132,7 @@ | ... | @@ -127,6 +132,7 @@ |
127 | } | 132 | } |
128 | 133 | ||
129 | return { | 134 | return { |
135 | + bindHandlers: bindHandlers, | ||
130 | start: start, | 136 | start: start, |
131 | stop: stop | 137 | stop: stop |
132 | }; | 138 | }; | ... | ... |
-
Please register or login to post a comment