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

ipc: Pass args to send_to_running_instance.

Browse Source
This commit is contained in:
Florian Bruhin 2015-08-29 23:09:44 +02:00
parent fe493f8565
commit 39e40a7887
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qutebrowser/misc/ipc.py
View File

@ -245,25 +245,25 @@ def _socket_error(action, socket):
action, socket.errorString(), socket.error())) action, socket.errorString(), socket.error()))
def send_to_running_instance(args): def send_to_running_instance(socketname, command):
"""Try to send a commandline to a running instance. """Try to send a commandline to a running instance.
Blocks for CONNECT_TIMEOUT ms. Blocks for CONNECT_TIMEOUT ms.
Args: Args:
args: The argparse namespace. socketname: The name which should be used for the socket.
command: The command to send to the running instance.
Return: Return:
True if connecting was successful, False if no connection was made. True if connecting was successful, False if no connection was made.
""" """
socket = QLocalSocket() socket = QLocalSocket()
socketname = _get_socketname(args.basedir)
log.ipc.debug("Connecting to {}".format(socketname)) log.ipc.debug("Connecting to {}".format(socketname))
socket.connectToServer(socketname) socket.connectToServer(socketname)
connected = socket.waitForConnected(100) connected = socket.waitForConnected(100)
if connected: if connected:
log.ipc.info("Opening in existing instance") log.ipc.info("Opening in existing instance")
json_data = {'args': args.command} json_data = {'args': command}
try: try:
cwd = os.getcwd() cwd = os.getcwd()
except OSError: except OSError:
@ -306,8 +306,9 @@ def send_or_listen(args):
The IPCServer instance if no running instance was detected. The IPCServer instance if no running instance was detected.
None if an instance was running and received our request. None if an instance was running and received our request.
""" """
socketname = _get_socketname(args.basedir)
try: try:
sent = send_to_running_instance(args) sent = send_to_running_instance(socketname, args.command)
if sent: if sent:
return None return None
log.init.debug("Starting IPC server...") log.init.debug("Starting IPC server...")
@ -319,7 +320,7 @@ def send_or_listen(args):
# This could be a race condition... # This could be a race condition...
log.init.debug("Got AddressInUseError, trying again.") log.init.debug("Got AddressInUseError, trying again.")
time.sleep(500) time.sleep(500)
sent = send_to_running_instance(args) sent = send_to_running_instance(socketname, args.command)
if sent: if sent:
return None return None
else: else: