Merge JoinMarket-Org/joinmarket-clientserver#1375: Log IRC connection attempts when using SOCKS5 proxy or TLS too

2e44f00ff3 Log IRC connection attempts when using SOCKS5 proxy or TLS too (Kristaps Kaupe)

Pull request description:

  Only attempts with `use_ssl = false` and `socks5 = false` were logged before this change.

Top commit has no ACKs.

Tree-SHA512: 6c8c1441a417282f7cd7f2757eea2238e42c12c48fe59d6a9f41ba8e3c14eec86da5d3c122398fbb101d746b0baf461391abf944c6dbd80fcf59535a7161f968

jmdaemon/jmdaemon/irc.py

@@ -151,10 +151,14 @@ class IRCMessageChannel(MessageChannel):
             ctx = ClientContextFactory()
         if self.usessl.lower() == 'true' and not self.socks5.lower() == 'true':
             factory = TxIRCFactory(self)
+            wlog('build_irc: ', self.serverport[0], str(self.serverport[1]),
+                self.channel)
             reactor.connectSSL(self.serverport[0], self.serverport[1],
                                factory, ctx)
         elif self.socks5.lower() == 'true':
             factory = TxIRCFactory(self)
+            wlog('build_irc: ', self.serverport[0], str(self.serverport[1]),
+                self.channel, str(self.socks5_host), self.socks5_port)
             #str() casts needed else unicode error
             torEndpoint = TCP4ClientEndpoint(reactor, str(self.socks5_host),
                                              self.socks5_port)