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

ipc: Add missing 0x prefix for logged socket IDs.

Browse Source
This commit is contained in:
Florian Bruhin 2016-01-08 13:09:49 +01:00
parent 8ca85b9c66
commit d84b15d35c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qutebrowser/misc/ipc.py
View File

@ -282,7 +282,7 @@ class IPCServer(QObject):
def _handle_invalid_data(self): def _handle_invalid_data(self):
"""Handle invalid data we got from a QLocalSocket.""" """Handle invalid data we got from a QLocalSocket."""
log.ipc.error("Ignoring invalid IPC data from socket {:x}.".format( log.ipc.error("Ignoring invalid IPC data from socket 0x{:x}.".format(
id(self._socket))) id(self._socket)))
self.got_invalid_data.emit() self.got_invalid_data.emit()
self._socket.error.connect(self.on_error) self._socket.error.connect(self.on_error)
@ -300,7 +300,7 @@ class IPCServer(QObject):
while self._socket is not None and self._socket.canReadLine(): while self._socket is not None and self._socket.canReadLine():
data = bytes(self._socket.readLine()) data = bytes(self._socket.readLine())
self.got_raw.emit(data) self.got_raw.emit(data)
log.ipc.debug("Read from socket {:x}: {}".format( log.ipc.debug("Read from socket 0x{:x}: {}".format(
id(self._socket), data)) id(self._socket), data))
try: try:
@ -347,7 +347,7 @@ class IPCServer(QObject):
def on_timeout(self): def on_timeout(self):
"""Cancel the current connection if it was idle for too long.""" """Cancel the current connection if it was idle for too long."""
log.ipc.error("IPC connection timed out " log.ipc.error("IPC connection timed out "
"(socket {:x}).".format(id(self._socket))) "(socket 0x{:x}).".format(id(self._socket)))
self._socket.disconnectFromServer() self._socket.disconnectFromServer()
if self._socket is not None: # pragma: no cover if self._socket is not None: # pragma: no cover
# on_socket_disconnected sets it to None # on_socket_disconnected sets it to None
@ -375,7 +375,7 @@ class IPCServer(QObject):
def shutdown(self): def shutdown(self):
"""Shut down the IPC server cleanly.""" """Shut down the IPC server cleanly."""
log.ipc.debug("Shutting down IPC (socket {:x})".format( log.ipc.debug("Shutting down IPC (socket 0x{:x})".format(
id(self._socket))) id(self._socket)))
if self._socket is not None: if self._socket is not None:
self._socket.deleteLater() self._socket.deleteLater()