diff --git a/src/drivers/Socket.py b/src/drivers/Socket.py index 17d63984d..63c73ab07 100644 --- a/src/drivers/Socket.py +++ b/src/drivers/Socket.py @@ -278,7 +278,7 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin): drivers.log.connectError(self.currentServer, e) self.scheduleReconnect() return - drivers.log.connect(self.currentServer) + drivers.log.connect(self.currentServer, socks_proxy=socks_proxy) try: self.conn = utils.net.getSocket( address, diff --git a/src/drivers/__init__.py b/src/drivers/__init__.py index 7a86fddb5..570e66d04 100644 --- a/src/drivers/__init__.py +++ b/src/drivers/__init__.py @@ -173,9 +173,14 @@ def run(): class Log(object): """This is used to have a nice, consistent interface for drivers to use.""" - def connect(self, server): - self.info('Connecting to %s:%s.', - server.hostname, server.port) + def connect(self, server, socks_proxy=None): + if socks_proxy: + socks_phrase = ' Via SOCKS proxy %s' + else: + socks_phrase = '' + socks_proxy = '' + self.info('Connecting to %s:%s.' + socks_phrase, + server.hostname, server.port, socks_proxy) def connectError(self, server, e): if isinstance(e, Exception):