Guest User

Untitled

a guest
Jan 16th, 2019
103
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.67 KB | None | 0 0
  1. diff -r cb269fd8f165 broadcast/alarmstream.go
  2. --- a/broadcast/alarmstream.go Mon Jan 14 15:09:00 2019 +0100
  3. +++ b/broadcast/alarmstream.go Wed Jan 16 17:06:39 2019 +0100
  4. @@ -181,6 +181,15 @@
  5. return nil
  6. }
  7.  
  8. +func (asb *AlarmStreamBroker) heartbeat() {
  9. + // TODO: Implement me!
  10. +}
  11. +
  12. +func (asb *AlarmStreamBroker) HandleHeartbeat(json.RawMessage) error {
  13. + asb.cmds <- func() { asb.heartbeat() }
  14. + return nil
  15. +}
  16. +
  17. // HandleAlarm is the entry point for "Alarm" events.
  18. func (asb *AlarmStreamBroker) HandleAlarm(msg json.RawMessage) error {
  19. return asb.handle(msg, (*AlarmStreamBroker).handleAlarm)
  20. diff -r cb269fd8f165 broadcast/pointstream.go
  21. --- a/broadcast/pointstream.go Mon Jan 14 15:09:00 2019 +0100
  22. +++ b/broadcast/pointstream.go Wed Jan 16 17:06:39 2019 +0100
  23. @@ -210,6 +210,17 @@
  24. return nil
  25. }
  26.  
  27. +func (psb *PointstreamBroker) heartbeat() {
  28. + // TODO: Implement me!
  29. +}
  30. +
  31. +// Handle the heartbeat from the Listen/Notify receiver.
  32. +func (psb *PointstreamBroker) HandleHeartbeat(json.RawMessage) error {
  33. + // Move to pointstream main.
  34. + psb.cmds <- func() { psb.heartbeat() }
  35. + return nil
  36. +}
  37. +
  38. func (psb *PointstreamBroker) registerClient(
  39. key string,
  40. geom wkt.Geom,
  41. diff -r cb269fd8f165 broadcast/receiver.go
  42. --- a/broadcast/receiver.go Mon Jan 14 15:09:00 2019 +0100
  43. +++ b/broadcast/receiver.go Wed Jan 16 17:06:39 2019 +0100
  44. @@ -84,6 +84,10 @@
  45.  
  46. for {
  47. select {
  48. + case <-time.After(time.Minute):
  49. + rcv.dispatch(`{"type": "hb-light"}`)
  50. + rcv.dispatch(`{"type": "hb-alarm"}`)
  51. +
  52. case e := <-listener.Notify:
  53. if e == nil {
  54. continue
  55. diff -r cb269fd8f165 controllers/controller.go
  56. --- a/controllers/controller.go Mon Jan 14 15:09:00 2019 +0100
  57. +++ b/controllers/controller.go Wed Jan 16 17:06:39 2019 +0100
  58. @@ -12,11 +12,13 @@
  59. )
  60.  
  61. const (
  62. - pointstreamType = "stroke"
  63. - alarmType = "Alarm"
  64. - allClearType = "Entwarnung"
  65. - testAlarmType = "Testalarm"
  66. - testAllClearType = "Testentwarnung"
  67. + pointstreamHeartbeatType = "hb-light"
  68. + alarmHeartbeatType = "hb-alarm"
  69. + pointstreamType = "stroke"
  70. + alarmType = "Alarm"
  71. + allClearType = "Entwarnung"
  72. + testAlarmType = "Testalarm"
  73. + testAllClearType = "Testentwarnung"
  74. )
  75.  
  76. // Controller encapsulates the state known to all endpoints.
  77. @@ -44,7 +46,9 @@
  78.  
  79. rcv := broadcast.NewReceiver(dsn)
  80. rcv.AddHandler(pointstreamType, c.psb.Handle)
  81. + rcv.AddHandler(pointstreamHeartbeatType, c.psb.HandleHeartbeat)
  82. rcv.AddHandler(alarmType, c.asb.HandleAlarm)
  83. + rcv.AddHandler(alarmHeartbeatType, c.asb.HandleHeartbeat)
  84. rcv.AddHandler(allClearType, c.asb.HandleAllClear)
  85. rcv.AddHandler(testAlarmType, c.asb.HandleTestAlarm)
  86. rcv.AddHandler(testAllClearType, c.asb.HandleTestAllClear)
Add Comment
Please, Sign In to add comment