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

Add ipc logging

Browse Source
This commit is contained in:
Florian Bruhin 2014-10-13 21:38:28 +02:00
parent 879cdf8904
commit de41dee0b5
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qutebrowser/utils/ipc.py
View File

@ -72,13 +72,14 @@ class IPCServer(QObject):
def handle_connection(self): def handle_connection(self):
"""Handle a new connection to the server.""" """Handle a new connection to the server."""
if self._socket is not None: if self._socket is not None:
# We already have a connection running, so we don't handle this one log.ipc.debug("Got new connection but ignoring it because we're "
# yet. "still handling another one.")
return return
socket = self._server.nextPendingConnection() socket = self._server.nextPendingConnection()
if socket is None: if socket is None:
# No new pending connections. log.ipc.debug("No new connection to handle.")
return return
log.ipc.debug("Client connected.")
socket.readyRead.connect(self.on_ready_read) socket.readyRead.connect(self.on_ready_read)
socket.disconnected.connect(self.on_disconnected) socket.disconnected.connect(self.on_disconnected)
socket.error.connect(self.on_error) socket.error.connect(self.on_error)
@ -87,6 +88,7 @@ class IPCServer(QObject):
@pyqtSlot() @pyqtSlot()
def on_disconnected(self): def on_disconnected(self):
"""Clean up socket when the client disconnected.""" """Clean up socket when the client disconnected."""
log.ipc.debug("Client disconnected.")
self._socket.deleteLater() self._socket.deleteLater()
self._socket = None self._socket = None
# Maybe another connection is waiting. # Maybe another connection is waiting.
@ -97,14 +99,19 @@ class IPCServer(QObject):
"""Read json data from the client.""" """Read json data from the client."""
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))
try: try:
decoded = data.decode('utf-8') decoded = data.decode('utf-8')
except UnicodeDecodeError: except UnicodeDecodeError:
log.ipc.error("Ignoring invalid UTF-8 IPC data.")
return return
try: try:
args = json.loads(decoded) args = json.loads(decoded)
except ValueError: except ValueError:
log.ipc.error("Ignoring invalid json IPC data '{}'.".format(
decoded))
return return
log.ipc.debug("Processing: {}".format(decoded))
app = objreg.get('app') app = objreg.get('app')
app.process_args(args) app.process_args(args)
@ -151,9 +158,11 @@ def send_to_running_instance(cmdlist):
socket.connectToServer(SOCKETNAME) socket.connectToServer(SOCKETNAME)
connected = socket.waitForConnected(100) connected = socket.waitForConnected(100)
if connected: if connected:
log.init.info("Opening in existing instance") log.ipc.info("Opening in existing instance")
line = json.dumps(cmdlist) + '\n' line = json.dumps(cmdlist) + '\n'
socket.writeData(line.encode('utf-8')) data = line.encode('utf-8')
log.ipc.debug("Writing: {}".format(data))
socket.writeData(data)
socket.waitForBytesWritten(WRITE_TIMEOUT) socket.waitForBytesWritten(WRITE_TIMEOUT)
if socket.error() != QLocalSocket.UnknownSocketError: if socket.error() != QLocalSocket.UnknownSocketError:
_socket_error("writing to running instance", socket) _socket_error("writing to running instance", socket)
@ -164,4 +173,6 @@ def send_to_running_instance(cmdlist):
QLocalSocket.ServerNotFoundError): QLocalSocket.ServerNotFoundError):
_socket_error("connecting to running instance", socket) _socket_error("connecting to running instance", socket)
else: else:
log.ipc.debug("No existing instance present (error {})".format(
socket.error()))
return False return False

1
qutebrowser/utils/log.py
View File

@ -124,6 +124,7 @@ js = logging.getLogger('js') # Javascript console messages
qt = logging.getLogger('qt') # Warnings produced by Qt qt = logging.getLogger('qt') # Warnings produced by Qt
style = logging.getLogger('style') style = logging.getLogger('style')
rfc6266 = logging.getLogger('rfc6266') rfc6266 = logging.getLogger('rfc6266')
ipc = logging.getLogger('ipc')
ram_handler = None ram_handler = None