From caf31517ca3afbb3a1778484922e5b60b4bc1157 Mon Sep 17 00:00:00 2001
From: blitzmann <holmes.ryan.90@gmail.com>
Date: Fri, 18 May 2018 01:18:46 -0400
Subject: [PATCH] Fix attempt for #1560

---
 service/server.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/service/server.py b/service/server.py
index 07da471b8..253b0417e 100644
--- a/service/server.py
+++ b/service/server.py
@@ -103,11 +103,18 @@ class AuthHandler(http.server.BaseHTTPRequestHandler):
     def log_message(self, format, *args):
         return
 
+import socketserver
 
 # http://code.activestate.com/recipes/425210-simple-stoppable-server-using-socket-timeout/
-class StoppableHTTPServer(http.server.HTTPServer):
+class StoppableHTTPServer(socketserver.TCPServer):
     def server_bind(self):
-        http.server.HTTPServer.server_bind(self)
+        # Can't use HTTPServer due to reliance on socket.getfqdn() which seems to be bugged.
+        # See https://github.com/pyfa-org/Pyfa/issues/1560#issuecomment-390095101
+        socketserver.TCPServer.server_bind(self)
+        host, port = self.server_address[:2]
+        self.server_name = host
+        self.server_port = port
+
         # self.settings = CRESTSettings.getInstance()
 
         # Allow listening for x seconds