jeena/hass-configurator
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Support settings

Browse source 
Updated to support loading from the settings file.
This commit is contained in:
Sytone 2017-08-02 12:14:41 -07:00 • committed by GitHub
parent 705880c217
commit cc84649977
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
configurator.py
View file

@ -50,8 +50,9 @@ BANLIMIT = 0
# Enable git integration. GitPython (https://gitpython.readthedocs.io/en/stable/) has # Enable git integration. GitPython (https://gitpython.readthedocs.io/en/stable/) has
# to be installed. # to be installed.
GIT = False GIT = False
# Files to ignore. ["*.", "*.log"] helps cleanup the UI. # Files to ignore in the UI. A good example list that cleans up the UI is
IGNORE_PATTERN = [".*", "*.log", "deps", "icloud", "*.conf", "*.json", "certs", "__pycache__"] # [".*", "*.log", "deps", "icloud", "*.conf", "*.json", "certs", "__pycache__"]
IGNORE_PATTERN = []
### End of options ### End of options
LOGLEVEL = logging.INFO LOGLEVEL = logging.INFO
@ -2679,7 +2680,8 @@ def signal_handler(sig, frame):
def load_settings(settingsfile): def load_settings(settingsfile):
global LISTENIP, LISTENPORT, BASEPATH, SSL_CERTIFICATE, SSL_KEY, HASS_API, \ global LISTENIP, LISTENPORT, BASEPATH, SSL_CERTIFICATE, SSL_KEY, HASS_API, \
HASS_API_PASSWORD, CREDENTIALS, ALLOWED_NETWORKS, BANNED_IPS, BANLIMIT, DEV HASS_API_PASSWORD, CREDENTIALS, ALLOWED_NETWORKS, BANNED_IPS, BANLIMIT, DEV, \
IGNORE_PATTERN
try: try:
if os.path.isfile(settingsfile): if os.path.isfile(settingsfile):
with open(settingsfile) as fptr: with open(settingsfile) as fptr:
@ -2696,6 +2698,7 @@ def load_settings(settingsfile):
BANNED_IPS = settings.get("BANNED_IPS", BANNED_IPS) BANNED_IPS = settings.get("BANNED_IPS", BANNED_IPS)
BANLIMIT = settings.get("BANLIMIT", BANLIMIT) BANLIMIT = settings.get("BANLIMIT", BANLIMIT)
DEV = settings.get("DEV", DEV) DEV = settings.get("DEV", DEV)
IGNORE_PATTERN = settings.get("IGNORE_PATTERN", IGNORE_PATTERN)
except Exception as err: except Exception as err:
LOG.warning(err) LOG.warning(err)
LOG.warning("Not loading static settings") LOG.warning("Not loading static settings")