jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-26 22:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert all http.py changes

Browse Source
This commit is contained in:
Robbie Trencheny 2016-04-10 16:08:00 -07:00
parent e70338dfe1
commit 085d90ed67
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
homeassistant/components/http.py
View File

@ -103,14 +103,7 @@ class HomeAssistantHTTPServer(ThreadingMixIn, HTTPServer):
self.development = development self.development = development
self.paths = [] self.paths = []
self.sessions = SessionStore() self.sessions = SessionStore()
self.protocol = 'https' if ssl_certificate is not None else 'http' self.use_ssl = ssl_certificate is not None
if server_address[0] == '0.0.0.0':
self.routable_address = util.get_local_ip()
else:
self.routable_address = server_address[0]
self.base_url = "{}://{}:{}".format(self.protocol,
self.routable_address,
self.server_address[1])
# We will lazy init this one if needed # We will lazy init this one if needed
self.event_forwarder = None self.event_forwarder = None
@ -132,7 +125,11 @@ class HomeAssistantHTTPServer(ThreadingMixIn, HTTPServer):
self.hass.bus.listen_once(ha.EVENT_HOMEASSISTANT_STOP, stop_http) self.hass.bus.listen_once(ha.EVENT_HOMEASSISTANT_STOP, stop_http)
_LOGGER.info("Starting web interface at %s", self.base_url) protocol = 'https' if self.use_ssl else 'http'
_LOGGER.info(
"Starting web interface at %s://%s:%d",
protocol, self.server_address[0], self.server_address[1])
# 31-1-2015: Refactored frontend/api components out of this component # 31-1-2015: Refactored frontend/api components out of this component
# To prevent stuff from breaking, load the two extracted components # To prevent stuff from breaking, load the two extracted components