Skip to content

Clean up some DB Calls, other tweaks #172

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
TobiTenno merged 12 commits into from
Feb 8, 2018
Merged

Clean up some DB Calls, other tweaks #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
af20f42
working on mysql cache
TobiTenno Jan 27, 2018
53157fd
working with cache, just need smarter refresh on update now
TobiTenno Jan 28, 2018
459af85
force update the cache when there notified ids are updated
TobiTenno Jan 29, 2018
be48ee5
fix syntax
TobiTenno Jan 29, 2018
20d3f0e
better errors, testing better caching
TobiTenno Jan 31, 2018
1338c1e
tweaks, fixes -
TobiTenno Feb 6, 2018
9b27dd6
fix table name
TobiTenno Feb 6, 2018
e16f0b7
bad logic with webhook check
TobiTenno Feb 6, 2018
aec288a
ensure prefix is set
TobiTenno Feb 6, 2018
0488821
use default settings if they don't exist in context
TobiTenno Feb 6, 2018
b15a751
fix syntax
TobiTenno Feb 6, 2018
f2044da
fix codacy issue
TobiTenno Feb 8, 2018
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
8 changes: 3 additions & 5 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Use the provided `.eslintrc.json` to lint your files, include any ignores in you

### Running

1. Get a bot token from the [discord application dashboard here](https://discordapp.com/developers/applications/me) and use it in a copy of `pm2.json`, we ignore `genesis.json` by default in our `.gitignore`.
1. Get a bot token from the [discord application dashboard here](https://discordapp.com/developers/applications/me) and use it in a copy of `pm2.json`, we ignore `genesis.json` by default in our `.gitignore`.

2. Install [pm2](http://pm2.keymetrics.io/docs/usage/quick-start/).

Expand All @@ -33,7 +33,7 @@ Use the provided `.eslintrc.json` to lint your files, include any ignores in you

6. Invite the bot to your server using the format:

`https://discordapp.com/oauth2/authorize?scope=bot&client_id=<bot_client_id>&permissions=<permissions###>`.
`https://discordapp.com/oauth2/authorize?scope=bot&client_id=<bot_client_id>&permissions=<permissions###>`.

### Resources

Expand All @@ -43,14 +43,12 @@ Use the provided `.eslintrc.json` to lint your files, include any ignores in you

* warframe-nexus-query [Docs](https://warframe-community-developers.github.io/warframe-nexus-query)

* warframe-location-query [Docs](https://warframe-community-developers.github.io/warframe-location-query)

* Contact Tobiah on Discord [Cephalon Genesis guild](https://discord.gg/0onjYYKuUBHiR3LK)

## Contributors

Nspace
* Awesome dude who's working on porting and updating the accumulated tech debt caused by hubot

Tobiah
* Other dude who's helping, writing features, debugging, and sometimes sleeping
16 changes: 0 additions & 16 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
'use strict';

const cluster = require('cluster');
const Nexus = require('warframe-nexus-query');
const Cache = require('json-fetch-cache');
const NexusFetcher = require('nexus-stats-api');
const Raven = require('raven');

const DataCache = require('./src/resources/DropCache.js');
Expand Down Expand Up @@ -37,18 +35,6 @@ process.on('unhandledRejection', (err) => {
logger.error(err);
});

const nexusOptions = {
user_key: process.env.NEXUSSTATS_USER_KEY || undefined,
user_secret: process.env.NEXUSSTATS_USER_SECRET || undefined,
api_url: process.env.NEXUS_API_OVERRIDE || undefined,
auth_url: process.env.NEXUS_AUTH_OVERRIDE || undefined,
ignore_limiter: true,
};

const nexusFetcher = new NexusFetcher(nexusOptions.nexusKey
&& nexusOptions.nexusSecret ? nexusOptions : {});

const nexusQuerier = new Nexus(nexusFetcher);

const caches = {
pc: new Cache('https://api.warframestat.us/pc', 600000),
Expand All @@ -71,9 +57,7 @@ if (cluster.isMaster) {
prefix: process.env.PREFIX,
logger,
owner: process.env.OWNER,
nexusQuerier,
caches,
nexusFetcher,
});
shard.start();
}
Loading