Merge branch 'develop'

2014-12-19 14:16:28 +01:00
parent f9fa87ce1d 538f51dd5b
commit aea673ddcd
1 changed files with 4 additions and 1 deletions
@@ -333,7 +333,10 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
    while try_restart:
        try:
            server.listen(config['port'], config['host'])
-            server.listen(config['port'], config['host6'])
+            
+            try: server.listen(config['port'], config['host6'])
+            except: log.info2('Tried to bind to IPV6 but failed')
+
            loop.start()
            server.close_all_connections()
            server.stop()