Merge branch 'dev' into pr/71

This commit is contained in:
Danielv123 committed 2018-04-11 15:22:42 +02:00
commit 51e41835ee
7 files changed
+141 -12

No files matched your search

+3 -1
View File
@@ -445,7 +445,7 @@ function instanceManagement() {
global.subscribedFiles = {};
}
if(pluginConfig.binary == "nodePackage"){
// require index.js.main() of plugin and execute it as a function
// require index.js.main() of plugin and execute it as a class
let pluginClass = require("./sharedPlugins/" + pluginDirectories[I] + "/index.js");
plugins[I] = new pluginClass(combinedConfig, function(data){
if(data.toString('utf8')[0] != "/") {
@@ -453,6 +453,8 @@ function instanceManagement() {
} else {
messageInterface(data.toString('utf8'));
}
}, { // extra functions to pass in object. Should have done it like this from the start, but won't break backwards compat.
socket, // socket.io connection to master (and ES6 destructuring, yay)
});
if(pluginConfig.scriptOutputFileSubscription && typeof pluginConfig.scriptOutputFileSubscription == "string"){
if(global.subscribedFiles[pluginConfig.scriptOutputFileSubscription]) {