Fix None.shutdown bug on rqd (#1145)

* Fix None.shutdown bug on rqd Besides that, also add variable args to on_interation as some versions of pynput will call this methot passing interaction arguments. * fix lint error
AcademySoftwareFoundation · May 25, 2022 · 76536a6 · 76536a6
1 parent 4402c1a
commit 76536a6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/rqd/rqd/rqnetwork.py b/rqd/rqd/rqnetwork.py
@@ -254,9 +254,9 @@ def start_grpc(self):
 
  def stopGrpc(self):
  """Stops the gRPC server."""
- self.grpcServer.shutdown()
- del self.grpcServer
- log.warning("Stopped grpc server")
+ if self.grpcServer:
+  self.grpcServer.shutdown()
+  del self.grpcServer
 
  def closeChannel(self):
  """Closes the gRPC channel."""

diff --git a/rqd/rqd/rqnimby.py b/rqd/rqd/rqnimby.py
@@ -280,7 +280,8 @@ def __init__(self, rqCore):
  on_scroll=self.on_interaction)
  self.keyboard_listener = pynput.keyboard.Listener(on_press=self.on_interaction)
 
- def on_interaction(self):
+ # pylint: disable=unused-argument
+ def on_interaction(self, *args):
  """ interaction detected """
  self.interaction_detected = True