wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-03 13:20:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into plugin-validation

Browse Source
This commit is contained in:
Wyatt Johnson
2017-04-06 15:04:24 -06:00
committed by GitHub
parent 28ce77a002 3b24e3c045
commit 54518af2a5
5 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins.js
+15 -2
View File
@@ -13,10 +13,23 @@ let plugins = {};
// file isn't loaded, but continuing. Else, like a parsing error, throw it and
// crash the program.
try {
plugins = JSON.parse(fs.readFileSync(path.join(__dirname, 'plugins.json'), 'utf8'));
let defaultPlugins = path.join(__dirname, 'plugins.default.json');
let customPlugins = path.join(__dirname, 'plugins.json');
let envPluginJSON = process.env.TALK_PLUGINS_JSON;
if (envPluginJSON && envPluginJSON.length > 0) {
debug('Now using TALK_PLUGINS_JSON environment variable for plugins');
plugins = JSON.parse(envPluginJSON);
} else if (fs.existsSync(customPlugins)) {
debug(`Now using ${customPlugins} for plugins`);
plugins = JSON.parse(fs.readFileSync(customPlugins, 'utf8'));
} else {
debug(`Now using ${defaultPlugins} for plugins`);
plugins = JSON.parse(fs.readFileSync(defaultPlugins, 'utf8'));
}
} catch (err) {
if (err.code === 'ENOENT') {
console.error('plugins.json not found, plugins will not be active');
console.error('plugins.json and plugins.default.json not found, plugins will not be active');
} else {
throw err;
}