Skip to content

Hotfix/hosts status check - closes #529 #528

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

Merged
55 merged 6 commits into from
Oct 15, 2015
Merged

Hotfix/hosts status check - closes #529 #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf7add6
apinf host updated
frenchbread Oct 14, 2015
62a6249
api umbrella host updated
frenchbread Oct 14, 2015
d909888
elasticsearch host updated
frenchbread Oct 14, 2015
4d621a1
apiUmbrella host fix
frenchbread Oct 14, 2015
fdf2854
Merge branch 'develop' into hotfix/hosts-status-check
frenchbread Oct 14, 2015
869c6a8
Updated README
frenchbread Oct 14, 2015
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
6 changes: 5 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,18 @@ There are many ways to get involved:
3. Clone [Apinf](https://github.com/apinf/api-umbrella-dashboard)
4. Create [`settings.json`](#Settings.json)
5. Type `meteor --settings /path/to/settings.json` in the project directory

# Settings.json

Your `settings.json` file should have the following structure:

```
{
"apinf": {
"host": "https://example.com/"
},
"api_umbrella": {
"host": "https://example.com/"
"api_key": "xxx",
"auth_token": "xxx",
"base_url": "https://example.com/api-umbrella/"
Expand Down
6 changes: 3 additions & 3 deletions server/methods/status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Meteor.methods({
try{

// initial host for apinf
var apinfHost = "https://apinf.com";
var apinfHost = Meteor.settings.apinf.host;

// response object from apinf GET request
var apinfResponse = Meteor.http.call("GET", apinfHost);
Expand Down Expand Up @@ -49,7 +49,7 @@ Meteor.methods({
try{

// initial host for API umbrella
var apiUmbrellaHost = "https://umbrella.apinf.io/";
var apiUmbrellaHost = Meteor.settings.api_umbrella.host;

// response object from API Umbrella GET request
var apiUmbrellaResponse = Meteor.http.call("GET", apiUmbrellaHost);
Expand Down Expand Up @@ -87,7 +87,7 @@ Meteor.methods({

try{
// initial host for elasticsearch instance
var elasticsearchInstance = "http://apinf.com:14002/";
var elasticsearchInstance = Meteor.settings.elasticsearch.host;

// response object from elasticsearch GET request
var elasticsearchResponse = Meteor.http.call("GET", elasticsearchInstance);
Expand Down