plugins XEP-0096, XEP-0065: fixed bad log calls
This commit is contained in:
parent
a1b79a7296
commit
45119d4d40
2 changed files with 4 additions and 4 deletions
|
|
@ -352,7 +352,7 @@ class SOCKSv5(protocol.Protocol, FileSender):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def authenticateUserPass(self, user, passwd):
|
def authenticateUserPass(self, user, passwd):
|
||||||
log.debug("User/pass: %s/%s", user, passwd)
|
log.debug("User/pass: %s/%s" % (user, passwd))
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def dataReceived(self, buf):
|
def dataReceived(self, buf):
|
||||||
|
|
@ -403,7 +403,7 @@ class Socks5ServerFactory(protocol.ServerFactory):
|
||||||
log.debug(_("Socks 5 server connection started"))
|
log.debug(_("Socks 5 server connection started"))
|
||||||
|
|
||||||
def clientConnectionLost(self, connector, reason):
|
def clientConnectionLost(self, connector, reason):
|
||||||
log.debug(_("Socks 5 server connection lost (reason: %s)"), reason)
|
log.debug(_("Socks 5 server connection lost (reason: %s)") % reason)
|
||||||
|
|
||||||
|
|
||||||
class Socks5ClientFactory(protocol.ClientFactory):
|
class Socks5ClientFactory(protocol.ClientFactory):
|
||||||
|
|
@ -431,7 +431,7 @@ class Socks5ClientFactory(protocol.ClientFactory):
|
||||||
log.debug(_("Socks 5 client connection started"))
|
log.debug(_("Socks 5 client connection started"))
|
||||||
|
|
||||||
def clientConnectionLost(self, connector, reason):
|
def clientConnectionLost(self, connector, reason):
|
||||||
log.debug(_("Socks 5 client connection lost (reason: %s)"), reason)
|
log.debug(_("Socks 5 client connection lost (reason: %s)") % reason)
|
||||||
self.finishedCb(self.sid, reason.type == error.ConnectionDone, self.profile) # TODO: really check if the state is actually successful
|
self.finishedCb(self.sid, reason.type == error.ConnectionDone, self.profile) # TODO: really check if the state is actually successful
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -180,7 +180,7 @@ class XEP_0096(object):
|
||||||
misc_elts.append(range_elt)
|
misc_elts.append(range_elt)
|
||||||
self.host.plugins["XEP-0095"].acceptStream(data["id"], data['from'], feature_elt, misc_elts, profile)
|
self.host.plugins["XEP-0095"].acceptStream(data["id"], data['from'], feature_elt, misc_elts, profile)
|
||||||
else:
|
else:
|
||||||
log.debug(_("Transfer [%s] refused"), sid)
|
log.debug(_("Transfer [%s] refused") % sid)
|
||||||
self.host.plugins["XEP-0095"].sendRejectedError(data["id"], data['from'], profile=profile)
|
self.host.plugins["XEP-0095"].sendRejectedError(data["id"], data['from'], profile=profile)
|
||||||
del(client._xep_0096_waiting_for_approval[sid])
|
del(client._xep_0096_waiting_for_approval[sid])
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue