1
=== modified file 'src/maasserver/listener.py'
2
--- src/maasserver/listener.py	2016-10-24 14:02:17 +0000
3
+++ src/maasserver/listener.py	2016-11-15 15:18:16 +0000
4
@@ -160,8 +160,20 @@
5
160
                    if self.isSystemChannel(notify.channel):
160
                    if self.isSystemChannel(notify.channel):
6
161
                        # System level message; pass it to the registered
161
                        # System level message; pass it to the registered
7
162
                        # handler immediately.
162
                        # handler immediately.
10
163
                        handler = self.listeners[notify.channel][0]
163
                        if notify.channel in self.listeners:
11
164
                        handler(notify.channel, notify.payload)
164
                            # Be defensive in that if a handler does not exist
12
165
                            # for this channel then the channel should be
13
166
                            # unregisted and removed from listeners.
14
167
                            if len(self.listeners[notify.channel]) > 0:
15
168
                                handler = self.listeners[notify.channel][0]
16
169
                                handler(notify.channel, notify.payload)
17
170
                            else:
18
171
                                self.unregisterChannel(notify.channel)
19
172
                                del self.listeners[notify.channel]
20
173
                        else:
21
174
                            # Unregister the channel since no listener is
22
175
                            # registered for this channel.
23
176
                            self.unregisterChannel(notify.channel)
24
165
                    else:
177
                    else:
25
166
                        # Place non-system messages into the queue to be
178
                        # Place non-system messages into the queue to be
26
167
                        # processed.
179
                        # processed.
27
168
180
28
=== modified file 'src/maasserver/tests/test_listener.py'
29
--- src/maasserver/tests/test_listener.py	2016-10-24 14:02:17 +0000
30
+++ src/maasserver/tests/test_listener.py	2016-11-15 15:18:16 +0000
31
@@ -110,6 +110,39 @@
32
110
110
33
111
    @wait_for_reactor
111
    @wait_for_reactor
34
112
    @inlineCallbacks
112
    @inlineCallbacks
35
113
    def test__handles_missing_system_handler_on_notification(self):
36
114
        listener = PostgresListenerService()
37
115
        # Change notifications to a frozenset. This makes sure that
38
116
        # the system message does not go into the queue. Instead if should
39
117
        # call the handler directly in `doRead`.
40
118
        listener.notifications = frozenset()
41
119
        yield listener.startService()
42
120
        yield deferToDatabase(listener.registerChannel, "sys_test")
43
121
        listener.listeners["sys_test"] = []
44
122
        try:
45
123
            yield deferToDatabase(self.send_notification, "sys_test", 1)
46
124
            self.assertFalse("sys_test" in listener.listeners)
47
125
        finally:
48
126
            yield listener.stopService()
49
127
50
128
    @wait_for_reactor
51
129
    @inlineCallbacks
52
130
    def test__handles_missing_notify_system_listener_on_notification(self):
53
131
        listener = PostgresListenerService()
54
132
        # Change notifications to a frozenset. This makes sure that
55
133
        # the system message does not go into the queue. Instead if should
56
134
        # call the handler directly in `doRead`.
57
135
        listener.notifications = frozenset()
58
136
        yield listener.startService()
59
137
        yield deferToDatabase(listener.registerChannel, "sys_test")
60
138
        try:
61
139
            yield deferToDatabase(self.send_notification, "sys_test", 1)
62
140
            self.assertFalse("sys_test" in listener.listeners)
63
141
        finally:
64
142
            yield listener.stopService()
65
143
66
144
    @wait_for_reactor
67
145
    @inlineCallbacks
68
113
    def test__calls_handler_on_notification(self):
146
    def test__calls_handler_on_notification(self):
69
114
        listener = PostgresListenerService()
147
        listener = PostgresListenerService()
70
115
        dv = DeferredValue()
148
        dv = DeferredValue()
Reviewer	Review Type	Date Requested	Status
Blake Rouse (community)			Approve on 2016-11-15
Review via email: mp+310894@code.launchpad.net