Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue#5: configution now includes all information #6

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Issue#5: configution now includes all information #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4aa9002
Issue#5: configution now includes all information
blumus Dec 5, 2016
704c6b5
removed use-mirror
blumus Dec 5, 2016
a9e45be
added test.sh script else travis fails
blumus Dec 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
requests==0.13.8
simplejson==2.6.1
wsgiref==0.1.2
dpath==1.4.0
3 changes: 2 additions & 1 deletion sensu/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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={}):
Expand Down Expand Up @@ -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):
Expand Down