From 0d14ac7763239d905451c2ac84365fc9f78647da Mon Sep 17 00:00:00 2001 From: shypike Date: Sat, 22 Nov 2014 12:14:01 +0100 Subject: [PATCH] In debug logging mode, use Google to determine our own IP address (IPv4 and IPv6). Helpful for diagnosing troublesome setups. --- SABnzbd.py | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/SABnzbd.py b/SABnzbd.py index 84ce614..b2d7b59 100755 --- a/SABnzbd.py +++ b/SABnzbd.py @@ -1290,23 +1290,24 @@ def main(): logging.info('Python-version = %s', sys.version) logging.info('Arguments = %s', sabnzbd.CMDLINE) - try: - s_ipv4 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - s_ipv4.connect(("google.com",80)) - logging.info('IP address = %s', s_ipv4.getsockname()[0]) - s_ipv4.close() - except: - logging.info('could not determine IP address') - pass - - try: - s_ipv6 = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM) - s_ipv6.connect(("ipv6.google.com",80)) - logging.info('IPv6 address = %s', s_ipv6.getsockname()[0]) - s_ipv6.close() - except: - logging.info('could not determine IPv6 address') - pass + if sabnzbd.cfg.log_level() > 1: + try: + s_ipv4 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + s_ipv4.connect(('google.com', 80)) + logging.debug('My IPv4 address = %s', s_ipv4.getsockname()[0]) + s_ipv4.close() + except: + logging.debug('Could not determine my IPv4 address') + pass + + try: + s_ipv6 = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM) + s_ipv6.connect(('ipv6.google.com', 80)) + logging.debug('My IPv6 address = %s', s_ipv6.getsockname()[0]) + s_ipv6.close() + except: + logging.debug('Could not determine my IPv6 address') + pass # OSX 10.5 I/O priority setting if sabnzbd.DARWIN: