codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unused method, duplicate log messages and add a method to get the logged in user's authentication level.

This commit is contained in:
Pedro Algarvio 2010-12-22 09:12:13 +00:00
parent e44cac0eaa
commit 3e0ea26e5f
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
deluge/ui/client.py
View File

@ -229,14 +229,17 @@ class DelugeRPCClientFactory(ClientFactory):
self.bytes_sent = 0 self.bytes_sent = 0
def startedConnecting(self, connector): def startedConnecting(self, connector):
log.info("Connecting to daemon at %s:%s..", connector.host, connector.port) log.info("Connecting to daemon at \"%s:%s\"...",
connector.host, connector.port)
def clientConnectionFailed(self, connector, reason): def clientConnectionFailed(self, connector, reason):
log.warning("Connection to daemon at %s:%s failed: %s", connector.host, connector.port, reason.value) log.warning("Connection to daemon at \"%s:%s\" failed: %s",
connector.host, connector.port, reason.value)
self.daemon.connect_deferred.errback(reason) self.daemon.connect_deferred.errback(reason)
def clientConnectionLost(self, connector, reason): def clientConnectionLost(self, connector, reason):
log.info("Connection lost to daemon at %s:%s reason: %s", connector.host, connector.port, reason.value) log.info("Connection lost to daemon at \"%s:%s\" reason: %s",
connector.host, connector.port, reason.value)
self.daemon.host = None self.daemon.host = None
self.daemon.port = None self.daemon.port = None
self.daemon.username = None self.daemon.username = None
@ -263,6 +266,7 @@ class DaemonSSLProxy(DaemonProxy):
self.host = None self.host = None
self.port = None self.port = None
self.username = None self.username = None
self.authentication_level = 0
self.connected = False self.connected = False
@ -432,8 +436,6 @@ class DaemonSSLProxy(DaemonProxy):
return self.daemon_info_deferred return self.daemon_info_deferred
def __on_connect_fail(self, reason): def __on_connect_fail(self, reason):
log.debug("__on_connect_fail called")
log.exception(reason)
self.daemon_info_deferred.errback(reason) self.daemon_info_deferred.errback(reason)
def authenticate(self, username, password): def authenticate(self, username, password):
@ -447,6 +449,7 @@ class DaemonSSLProxy(DaemonProxy):
def __on_login(self, result, username): def __on_login(self, result, username):
log.debug("__on_login called: %s %s", username, result) log.debug("__on_login called: %s %s", username, result)
self.username = username self.username = username
self.authentication_level = result
# We need to tell the daemon what events we're interested in receiving # We need to tell the daemon what events we're interested in receiving
if self.__factory.event_handlers: if self.__factory.event_handlers:
self.call("daemon.set_event_interest", self.__factory.event_handlers.keys()) self.call("daemon.set_event_interest", self.__factory.event_handlers.keys())
@ -578,10 +581,9 @@ class Client(object):
self._daemon_proxy = DaemonSSLProxy(dict(self.__event_handlers)) self._daemon_proxy = DaemonSSLProxy(dict(self.__event_handlers))
self._daemon_proxy.set_disconnect_callback(self.__on_disconnect) self._daemon_proxy.set_disconnect_callback(self.__on_disconnect)
d = self._daemon_proxy.connect(host, port) d = self._daemon_proxy.connect(host, port)
def on_connect_fail(result): def on_connect_fail(reason):
log.debug("on_connect_fail: %s", result)
self.disconnect() self.disconnect()
return result return reason
d.addErrback(on_connect_fail) d.addErrback(on_connect_fail)
if not skip_authentication: if not skip_authentication:
@ -589,7 +591,6 @@ class Client(object):
def on_authenticate(result, daemon_info): def on_authenticate(result, daemon_info):
log.debug("Authentication sucessfull: %s", result) log.debug("Authentication sucessfull: %s", result)
self.authentication_level = result
auth_deferred.callback(daemon_info) auth_deferred.callback(daemon_info)
def on_authenticate_fail(reason): def on_authenticate_fail(reason):
@ -653,10 +654,6 @@ class Client(object):
else: else:
return True return True
def daemon_info(self):
return self._daemon_proxy.daemon_info_deferred
return defer.succeed(self._daemon_proxy.daemon_info or None)
def is_localhost(self): def is_localhost(self):
""" """
Checks if the current connected host is a localhost or not. Checks if the current connected host is a localhost or not.
@ -761,5 +758,14 @@ class Client(object):
""" """
return self._daemon_proxy.get_bytes_sent() return self._daemon_proxy.get_bytes_sent()
def get_auth_level(self):
"""
Returns the authentication level the daemon returned upon authentication.
:returns: the authentication level
:rtype: int
"""
return self._daemon_proxy.authentication_level
# This is the object clients will use # This is the object clients will use
client = Client() client = Client()