Merge pull request #2154 from home-assistant/hotfix-20-2

Hotfix 20 2
If we have duration_in_traffic use that as the state, otherwise use duration
2016-05-23 22:25:59 -07:00 · 2016-05-23 23:43:22 -04:00 · 2016-05-23 23:43:06 -04:00 · 2016-05-23 23:29:53 -04:00 · 2016-05-23 23:29:53 -04:00 · 2016-05-23 13:08:47 -07:00
4 changed files with 27 additions and 41 deletions
@@ -1,4 +1,6 @@
-Make sure you run the latest version before reporting an issue. Feature requests should go in the forum: https://community.home-assistant.io/c/feature-requests
+Make sure you are running the latest version of Home Assistant before reporting an issue.
+
+You should only file an issue if you found a bug. Feature and enhancement requests should go in [the Feature Requests section](https://community.home-assistant.io/c/feature-requests) of our community forum:

 **Home Assistant release (`hass --version`):**

@@ -4,7 +4,6 @@ from __future__ import print_function
 import argparse
 import os
 import platform
-import signal
 import subprocess
 import sys
 import threading
@@ -321,33 +320,18 @@ def try_to_restart():
    # Count remaining threads, ideally there should only be one non-daemonized
    # thread left (which is us). Nothing we really do with it, but it might be
    # useful when debugging shutdown/restart issues.
-    nthreads = sum(thread.isAlive() and not thread.isDaemon()
-                   for thread in threading.enumerate())
-    if nthreads > 1:
-        sys.stderr.write("Found {} non-daemonic threads.\n".format(nthreads))
+    try:
+        nthreads = sum(thread.isAlive() and not thread.isDaemon()
+                       for thread in threading.enumerate())
+        if nthreads > 1:
+            sys.stderr.write(
+                "Found {} non-daemonic threads.\n".format(nthreads))

-    # Send terminate signal to all processes in our process group which
-    # should be any children that have not themselves changed the process
-    # group id. Don't bother if couldn't even call setpgid.
-    if hasattr(os, 'setpgid'):
-        sys.stderr.write("Signalling child processes to terminate...\n")
-        os.kill(0, signal.SIGTERM)
-
-        # wait for child processes to terminate
-        try:
-            while True:
-                time.sleep(1)
-                if os.waitpid(0, os.WNOHANG) == (0, 0):
-                    break
-        except OSError:
-            pass
-
-    elif os.name == 'nt':
-        # Maybe one of the following will work, but how do we indicate which
-        # processes are our children if there is no process group?
-        # os.kill(0, signal.CTRL_C_EVENT)
-        # os.kill(0, signal.CTRL_BREAK_EVENT)
-        pass
+    # Somehow we sometimes seem to trigger an assertion in the python threading
+    # module. It seems we find threads that have no associated OS level thread
+    # which are not marked as stopped at the python level.
+    except AssertionError:
+        sys.stderr.write("Failed to count non-daemonic threads.\n")

    # Try to not leave behind open filedescriptors with the emphasis on try.
    try:
@@ -400,13 +384,6 @@ def main():
    if args.pid_file:
        write_pid(args.pid_file)

-    # Create new process group if we can
-    if hasattr(os, 'setpgid'):
-        try:
-            os.setpgid(0, 0)
-        except PermissionError:
-            pass
-
    exit_code = setup_and_run_hass(config_dir, args)
    if exit_code == RESTART_EXIT_CODE and not args.runner:
        try_to_restart()
@@ -136,11 +136,12 @@ class GoogleTravelTimeSensor(Entity):
    @property
    def state(self):
        """Return the state of the sensor."""
-        try:
-            res = self._matrix['rows'][0]['elements'][0]['duration']['value']
-            return round(res/60)
-        except KeyError:
-            return None
+        _data = self._matrix['rows'][0]['elements'][0]
+        if 'duration_in_traffic' in _data:
+            return round(_data['duration_in_traffic']['value']/60)
+        if 'duration' in _data:
+            return round(_data['duration']['value']/60)
+        return None

    @property
    def name(self):
@@ -175,9 +176,15 @@ class GoogleTravelTimeSensor(Entity):
        atime = options_copy.get('arrival_time')
        if dtime is not None and ':' in dtime:
            options_copy['departure_time'] = convert_time_to_utc(dtime)
+        elif dtime is not None:
+            options_copy['departure_time'] = dtime
+        else:
+            options_copy['departure_time'] = 'now'

        if atime is not None and ':' in atime:
            options_copy['arrival_time'] = convert_time_to_utc(atime)
+        elif atime is not None:
+            options_copy['arrival_time'] = atime

        self._matrix = self._client.distance_matrix(self._origin,
                                                    self._destination,
@@ -1,7 +1,7 @@
 # coding: utf-8
 """Constants used by Home Assistant components."""

-__version__ = "0.20.0"
+__version__ = "0.20.2"
 REQUIRED_PYTHON_VER = (3, 4)

 PLATFORM_FORMAT = '{}.{}'
Author	SHA1	Message	Date
Paulus Schoutsen	644d5de890	Merge pull request #2154 from home-assistant/hotfix-20-2 Hotfix 20 2	2016-05-23 22:25:59 -07:00
Robbie Trencheny	343625d539	If we have duration_in_traffic use that as the state, otherwise use duration	2016-05-23 23:43:22 -04:00
Robbie Trencheny	2e10b4bf67	If no departure time is set, use now as the default. If departure time is set but does not have a :, assume its a preformed Unix timestamp and send along as raw input. Assume same for arrival_time.	2016-05-23 23:43:06 -04:00
Jan Harkes	d86a5a1e91	Don't even bother trying to kill stray child processes. When we change our process group id we don't get keyboard interrupt signals passed if our parent is a bash script.	2016-05-23 23:29:53 -04:00
Jan Harkes	1327051277	Version bump to 0.20.2	2016-05-23 23:29:53 -04:00
Robbie Trencheny	2544635921	Update issue template to prettify the header.	2016-05-23 13:08:47 -07:00
Paulus Schoutsen	3c364fa7e9	Merge pull request #2132 from home-assistant/hotfix-20-1 Hotfix 0.20.1	2016-05-22 09:11:47 -07:00
Jan Harkes	ceb0ec5fa4	Ignore assertions from python threading when looking for leaked threads. While looking for leaked resources (threads) after shutdown and before restart we in some cases get an assertion in the python threading module where we find a thread marked as running at the python level but it has no associated thread at the C level.	2016-05-22 00:22:19 -04:00
Jan Harkes	a28196df9a	Version bump to 0.20.1	2016-05-22 00:21:19 -04:00