From 38ed025ce3dbd5daed078634a6f1fabc97535be2 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 24 Sep 2014 21:58:39 -0500 Subject: [PATCH] Improved logging message for HTTP and SUN components --- README.md | 2 +- ...stant.conf.default => home-assistant.conf.example} | 0 homeassistant/components/http/__init__.py | 11 +++++++---- homeassistant/components/sun.py | 6 +++--- 4 files changed, 11 insertions(+), 8 deletions(-) rename config/{home-assistant.conf.default => home-assistant.conf.example} (100%) diff --git a/README.md b/README.md index d44100ef512..e881ae1f18a 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Installation instructions / Quick-start guide --------------------------------------------- * The core depends on [PyEphem](http://rhodesmill.org/pyephem/) and [Requests](http://python-requests.org). Depending on the built-in components you would like to use you will need [PHue](https://github.com/studioimaginaire/phue) for Philips Hue support and [PyChromecast](https://github.com/balloob/pychromecast) for Chromecast support. Install these using `pip3 install -r requirements.txt`. * Clone the repository and pull in the submodules `git clone --recursive https://github.com/balloob/home-assistant.git` -* In the config directory, copy `home-assistant.conf.default` to `home-assistant.conf` and adjust the config values to match your setup. +* In the config directory, copy `home-assistant.conf.example` to `home-assistant.conf` and adjust the config values to match your setup. * For routers running Tomato you will have to not only setup your host, username and password but also a http_id. The http_id can be retrieved by going to the admin console of your router, view the source of any of the pages and search for `http_id`. * If you want to use Hue, setup PHue by running `python -m phue --host HUE_BRIDGE_IP_ADDRESS --config-file-path phue.conf` from the commandline inside your config directory and follow the instructions. * While running the script it will create and maintain a file called `known_devices.csv` which will contain the detected devices. Adjust the track variable for the devices you want the script to act on and restart the script or call the service `device_tracker/reload_devices_csv`. diff --git a/config/home-assistant.conf.default b/config/home-assistant.conf.example similarity index 100% rename from config/home-assistant.conf.default rename to config/home-assistant.conf.example diff --git a/homeassistant/components/http/__init__.py b/homeassistant/components/http/__init__.py index 29eaf055315..69b86e319b5 100644 --- a/homeassistant/components/http/__init__.py +++ b/homeassistant/components/http/__init__.py @@ -172,6 +172,7 @@ class HomeAssistantHTTPServer(ThreadingMixIn, HTTPServer): self.hass = hass self.api_password = api_password + self.server_address = server_address self.logger = logging.getLogger(__name__) # To store flash messages between sessions @@ -182,7 +183,9 @@ class HomeAssistantHTTPServer(ThreadingMixIn, HTTPServer): def start(self): """ Starts the server. """ - self.logger.info("Starting") + self.logger.info( + "Web interface starting at http://{}:{}".format( + *self.server_address)) self.serve_forever() @@ -365,9 +368,9 @@ class RequestHandler(BaseHTTPRequestHandler): "Home Assistant" "" - "" - "" + "" + "" "" "