diff --git a/.travis.yml b/.travis.yml index e472bca..46e72b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,11 @@ python: - "2.7" install: # Build/test dependencies - - pip install -r requirements.txt -r requirements-test.txt --use-mirrors -script: ./test.sh -v + - pip install -r requirements.txt -r requirements-test.txt notifications: irc: channels: "irc.freenode.org#vitasso" on_success: change on_failure: change +script: + - ./test.sh diff --git a/requirements.txt b/requirements.txt index a96f1df..d23faca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ requests==0.13.8 simplejson==2.6.1 wsgiref==0.1.2 +dpath==1.4.0 diff --git a/sensu/utils.py b/sensu/utils.py index 2a25bee..dbbc258 100644 --- a/sensu/utils.py +++ b/sensu/utils.py @@ -24,6 +24,7 @@ import simplejson as json except ImportError: import json +import dpath def api_request(host=None, path='', method='get', \ data=None, params={}): @@ -70,7 +71,7 @@ def load_config(filename=None): def load_settings(): data = {} for cfg in get_config_files(): - data = dict(data.items() + load_config(cfg).items()) + dpath.util.merge(data,load_config(cfg)) return data def read_event(data=None):