matrix/weechat-matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server: Handle malformed server responses.

Browse source
This commit is contained in:
Damir Jelić 2018-07-24 11:05:29 +02:00
parent 4b67dc015b
commit 32df9230ea
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
main.py
View file

@ -35,7 +35,7 @@ import logbook
from logbook import Logger, StderrHandler, StreamHandler from logbook import Logger, StderrHandler, StreamHandler
import nio import nio
from nio import TransportType from nio import TransportType, RemoteTransportError
from matrix.colors import Formatted from matrix.colors import Formatted
from matrix.utf import utf8_decode from matrix.utf import utf8_decode
@ -296,7 +296,11 @@ def receive_cb(server_name, file_descriptor):
server.disconnect() server.disconnect()
break break
server.client.receive(data) try:
server.client.receive(data)
except RemoteTransportError as e:
server.error(str(e))
server.disconnect()
response = server.client.next_response() response = server.client.next_response()

10
matrix/server.py
View file

@ -30,7 +30,7 @@ from matrix.plugin_options import Option, DebugType
from matrix.utils import (key_from_value, prnt_debug, server_buffer_prnt, from matrix.utils import (key_from_value, prnt_debug, server_buffer_prnt,
create_server_buffer) create_server_buffer)
from matrix.utf import utf8_decode from matrix.utf import utf8_decode
from matrix.globals import W, SERVERS from matrix.globals import W, SERVERS, SCRIPT_NAME
from .buffer import RoomBuffer, OwnMessage, OwnAction from .buffer import RoomBuffer, OwnMessage, OwnAction
try: try:
@ -279,6 +279,14 @@ class MatrixServer:
# type: (MatrixServer) -> None # type: (MatrixServer) -> None
self.send_buffer = b"" self.send_buffer = b""
def error(self, message):
buf = ""
if self.server_buffer:
buf = self.server_buffer
msg = "{prefix}{}: {}".format(SCRIPT_NAME, message)
W.prnt(buf, msg)
def send(self, data): def send(self, data):
# type: (bytes) -> bool # type: (bytes) -> bool
self.try_send(data) self.try_send(data)