Revision 25942a6c daemons/ganeti-masterd
| b/daemons/ganeti-masterd | ||
|---|---|---|
| 147 | 147 |
|
| 148 | 148 |
class ClientRqHandler(SocketServer.BaseRequestHandler): |
| 149 | 149 |
"""Client handler""" |
| 150 |
EOM = '\3' |
|
| 151 | 150 |
READ_SIZE = 4096 |
| 152 | 151 |
|
| 153 | 152 |
def setup(self): |
| ... | ... | |
| 201 | 200 |
data = self.request.recv(self.READ_SIZE) |
| 202 | 201 |
if not data: |
| 203 | 202 |
return None |
| 204 |
new_msgs = (self._buffer + data).split(self.EOM)
|
|
| 203 |
new_msgs = (self._buffer + data).split(constants.LUXI_EOM)
|
|
| 205 | 204 |
self._buffer = new_msgs.pop() |
| 206 | 205 |
self._msgs.extend(new_msgs) |
| 207 | 206 |
return self._msgs.popleft() |
| ... | ... | |
| 209 | 208 |
def send_message(self, msg): |
| 210 | 209 |
#print "sending", msg |
| 211 | 210 |
# TODO: sendall is not guaranteed to send everything |
| 212 |
self.request.sendall(msg + self.EOM)
|
|
| 211 |
self.request.sendall(msg + constants.LUXI_EOM)
|
|
| 213 | 212 |
|
| 214 | 213 |
|
| 215 | 214 |
class ClientOps: |
Also available in: Unified diff