rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle multiple connections properly #2.

Browse Source
This commit is contained in:
Florian Bruhin 2014-10-13 22:35:10 +02:00
parent de41dee0b5
commit bdb7cc96b4
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
qutebrowser/utils/ipc.py
View File

@ -80,10 +80,19 @@ class IPCServer(QObject):
log.ipc.debug("No new connection to handle.") log.ipc.debug("No new connection to handle.")
return return
log.ipc.debug("Client connected.") log.ipc.debug("Client connected.")
socket.readyRead.connect(self.on_ready_read)
socket.disconnected.connect(self.on_disconnected)
socket.error.connect(self.on_error)
self._socket = socket self._socket = socket
socket.readyRead.connect(self.on_ready_read)
if socket.canReadLine():
log.ipc.debug("We can read a line immediately.")
self.on_ready_read()
socket.error.connect(self.on_error)
if socket.error() != QLocalSocket.UnknownSocketError:
log.ipc.debug("We got an error immediately.")
self.on_error(socket.error())
socket.disconnected.connect(self.on_disconnected)
if socket.state() == QLocalSocket.UnconnectedState:
log.ipc.debug("Socket was disconnected immediately.")
self.on_disconnected()
@pyqtSlot() @pyqtSlot()
def on_disconnected(self): def on_disconnected(self):
@ -97,6 +106,10 @@ class IPCServer(QObject):
@pyqtSlot() @pyqtSlot()
def on_ready_read(self): def on_ready_read(self):
"""Read json data from the client.""" """Read json data from the client."""
if self._socket is None:
# this happened once and I don't know why
log.ipc.warn("In on_ready_read with None socket!")
return
while self._socket.canReadLine(): while self._socket.canReadLine():
data = bytes(self._socket.readLine()) data = bytes(self._socket.readLine())
log.ipc.debug("Read from socket: {}".format(data)) log.ipc.debug("Read from socket: {}".format(data))