Merge pull request #187 from weka-io/master

another fix for SSL authentication, and some logging

bin/rpyc_classic.py

@@ -70,8 +70,8 @@ def main(self):
             self.registrar = TCPRegistryClient(ip = self.registry_host, port = self.registry_port)
 
         if self.ssl_keyfile:
-            self.authenticator = SSLAuthenticator(str(self.ssl_keyfile), str(self.ssl_certfile), 
-                str(self.ssl_cafile))
+            self.authenticator = SSLAuthenticator(self.ssl_keyfile, self.ssl_certfile, 
+                self.ssl_cafile)
             default_port = DEFAULT_SERVER_SSL_PORT
         else:
             self.authenticator = None

rpyc/core/protocol.py

@@ -320,16 +320,19 @@ def _netref_factory(self, oid, clsname, modname):
     # dispatching
     #
     def _dispatch_request(self, seq, raw_args):
+        logger = self._config["logger"]
         try:
             handler, args = raw_args
+            if logger:
+                logger.debug("dispatching: %r (%r)", handler, seq)
             args = self._unbox(args)
             res = self._HANDLERS[handler](self, *args)
         except:
             # need to catch old style exceptions too
             t, v, tb = sys.exc_info()
             self._last_traceback = tb
-            if self._config["logger"] and t is not StopIteration:
-                self._config["logger"].debug("Exception caught", exc_info=True)
+            if logger and t is not StopIteration:
+                logger.debug("Exception caught", exc_info=True)
             if t is SystemExit and self._config["propagate_SystemExit_locally"]:
                 raise
             if t is KeyboardInterrupt and self._config["propagate_KeyboardInterrupt_locally"]: