diff --git a/WebServer/AppLoader.js b/WebServer/AppLoader.js index dd11b222b..29f36be5f 100644 --- a/WebServer/AppLoader.js +++ b/WebServer/AppLoader.js @@ -214,60 +214,5 @@ function newAppLoader() { 'Plotters/Masters/Plotters-Bollinger-Bands/PercentageBandwidth.js' ] } - - function getPlotters(ecosystem) { - if (INFO_LOG === true) { console.log('[INFO] server -> onBrowserRequest -> onFileRead -> addPlotters -> Entering function.') } - - let plotters = [] - let dataMines = ecosystem.dataMines - let hosts = ecosystem.hosts - - plotters = plotters.concat(addScript(dataMines)) - plotters = plotters.concat(addScript(hosts)) - - return plotters - } - - function addScript(pDataMinesOrHosts) { - if (INFO_LOG === true) { console.log('[INFO] server -> onBrowserRequest -> onFileRead -> addPlotters -> addScript -> Entering function.') } - const htmlLinePlotter = 'Plotters/@dataMine@/@repo@/@module@.js' - const htmlLinePlotterPanel = 'PlotterPanels/@dataMine@/@repo@/@module@.js' - let plotters = [] - - for (let i = 0; i < pDataMinesOrHosts.length; i++) { - let dataMine = pDataMinesOrHosts[i] - for (let j = 0; j < dataMine.plotters.length; j++) { - let plotter = dataMine.plotters[j] - if (plotter.modules !== undefined) { - for (let k = 0; k < plotter.modules.length; k++) { - let module = plotter.modules[k] - let htmlLineCopy = htmlLinePlotter - - let stringToInsert - stringToInsert = htmlLineCopy.replace('@dataMine@', dataMine.codeName) - stringToInsert = stringToInsert.replace('@repo@', plotter.repo) - stringToInsert = stringToInsert.replace('@module@', module.moduleName) - - plotters.push(stringToInsert) - - if (module.panels !== undefined) { - for (let l = 0; l < module.panels.length; l++) { - let panel = module.panels[l] - let htmlLineCopy = htmlLinePlotterPanel - - let stringToInsert - stringToInsert = htmlLineCopy.replace('@dataMine@', dataMine.codeName) - stringToInsert = stringToInsert.replace('@repo@', plotter.repo) - stringToInsert = stringToInsert.replace('@module@', panel.moduleName) - - plotters.push(stringToInsert) - } - } - } - } - } - } - return plotters - } } diff --git a/taskManagerServer.js b/taskManagerServer.js index 7ab879449..3e925042c 100644 --- a/taskManagerServer.js +++ b/taskManagerServer.js @@ -1,7 +1,5 @@ exports.newTaskManagerServer = function newTaskManagerServer(WEB_SOCKETS_SERVER, EVENTS_SERVER) { - const MODULE = "Task Manager Server" - let thisObject = { initialize: initialize, finalize: finalize, diff --git a/webServer.js b/webServer.js index 010314dd4..718b9ad06 100644 --- a/webServer.js +++ b/webServer.js @@ -1,7 +1,5 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) { - const MODULE = "Web Server" - let thisObject = { initialize: initialize, finalize: finalize, @@ -19,7 +17,7 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) { let http = require('http') let isHttpServerStarted = false - let cloneExecutorChildProcess + let webhook = new Map() return thisObject