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

Move the socket closing function into the server class.

Browse source
This commit is contained in:
poljar (Damir Jelić) 2018-02-02 10:37:06 +01:00
parent e7f229e4a2
commit b9fd3869f4
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
matrix/server.py
View file

@ -304,13 +304,18 @@ class MatrixServer:
server_buffer_prnt(self, message) server_buffer_prnt(self, message)
def _close_socket(self):
# type: (socket.socket) -> None
if self.socket:
self.socket.shutdown(socket.SHUT_RDWR)
self.socket.close()
def disconnect(self, reconnect=True): def disconnect(self, reconnect=True):
# type: (MatrixServer) -> None # type: (MatrixServer) -> None
if self.fd_hook: if self.fd_hook:
W.unhook(self.fd_hook) W.unhook(self.fd_hook)
if self.socket: self._close_socket()
close_socket(self.socket)
self.fd_hook = None self.fd_hook = None
self.socket = None self.socket = None
@ -484,7 +489,3 @@ def send_cb(server_name, file_descriptor):
return W.WEECHAT_RC_OK return W.WEECHAT_RC_OK
def close_socket(sock):
# type: (socket.socket) -> None
sock.shutdown(socket.SHUT_RDWR)
sock.close()