-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
removed pyTibber dependency, watchdog improved
- Loading branch information
1 parent
c35a0cd
commit c36b38e
Showing
10 changed files
with
96 additions
and
75 deletions.
There are no files selected for viewing
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| aiohttp | ||
| gql[websockets] | ||
| paho-mqtt | ||
| pytibber | ||
| pyyaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,24 @@ | ||
| import os | ||
| from functools import reduce | ||
|
|
||
| def get_argument(config: dict, keys: list, varname: str, optional=False): | ||
| try: | ||
| return os.environ[varname] | ||
| except: | ||
| def get_optional_argument(config: dict, *keys: str, varname: str = None): # type: ignore | ||
| if varname is not None: | ||
| try: | ||
| for key in keys: | ||
| dict = dict[key] | ||
| return str(dict) | ||
| return os.environ[varname] | ||
| except: | ||
| if optional: | ||
| return None | ||
| print(f'Error: Missing config entry or environment variable {varname}.') | ||
| exit() | ||
| pass | ||
|
|
||
| sub_config = config | ||
| try: | ||
| for key in keys: | ||
| sub_config = sub_config[key] | ||
| return sub_config | ||
| except: | ||
| return None | ||
|
|
||
| def get_recursive_key(dict, *keys, optional=False): | ||
| final_key = keys[-1] | ||
| for key in keys[:-1]: | ||
| dict = dict.get(key, {}) | ||
| value = dict.get(final_key, None) | ||
| if optional or value: | ||
| return value | ||
| def get_argument(config: dict, *keys: str, varname: str = None): # type: ignore | ||
| raw_value = get_optional_argument(config, *keys, varname=varname) | ||
| if raw_value is None: | ||
| print(f'Error: Missing config entry or environment variable for {".".join(keys)}.') | ||
| exit() | ||
| else: | ||
| print(f'Key {".".join(keys)} not found in configuration.') | ||
| exit() | ||
| return raw_value |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,46 @@ | ||
| import datetime | ||
|
|
||
| from logger import * | ||
| from helpers import get_argument | ||
|
|
||
| class Watchdog: | ||
| def __init__(self): | ||
| self.__tolerance = datetime.timedelta(seconds=10) | ||
| def __init__(self, config: dict): | ||
| tolerance = int(get_argument(config, 'watchdog', 'tolerance')) | ||
| self.__tolerance = datetime.timedelta(seconds=tolerance) | ||
|
|
||
| timeout = int(get_argument(config, 'watchdog', 'timeout')) | ||
| self.__timeout = datetime.timedelta(seconds=timeout) | ||
| self.__current_timeout = self.__timeout | ||
|
|
||
| maximum_timeout = int(get_argument(config, 'watchdog', 'maximum_timeout')) | ||
| self.__maximum_timeout = datetime.timedelta(seconds=maximum_timeout) | ||
|
|
||
| self.__lost_at = None | ||
| self.__timeout = 5 | ||
|
|
||
| def check(self, last_timestamp): | ||
| now = datetime.datetime.now() | ||
| if last_timestamp + self.__tolerance < now: | ||
| if self.__lost_at is None: | ||
| logger.log('Lost tibber live data.') | ||
| self.__lost_at = now | ||
| if self.__lost_at + datetime.timedelta(seconds=self.__timeout) < now: | ||
| return True | ||
| seconds_until_reconnect = (self.__current_timeout - (now - self.__lost_at)).total_seconds() | ||
| if seconds_until_reconnect <= 0: | ||
| return False | ||
| else: | ||
| logger.log(f'{round(seconds_until_reconnect)}s until reconnect.') | ||
| else: | ||
| self.__reset_timeout() | ||
| self.__lost_at = None | ||
| return True | ||
|
|
||
| def subscription_success(self, success): | ||
| self.__lost_at = datetime.datetime.now() | ||
| self.__lost_at = None | ||
| if success: | ||
| self.__reset_timeout() | ||
| else: | ||
| self.__timeout = min (self.__timeout * 2, 3600) | ||
| logger.log(f'Reconnect attempt in {self.__timeout} seconds.') | ||
| self.__timeout = min (self.__timeout * 2, self.__maximum_timeout) | ||
| logger.log(f'Reconnect attempt in {round(self.__timeout.total_seconds())} seconds.') | ||
|
|
||
| def __reset_timeout(self): | ||
| self.__timeout = 5 | ||
| self.__current_timeout = self.__timeout |