From c67c66783cc25ff6804f0c3baca5fac050537686 Mon Sep 17 00:00:00 2001 From: Christian Hofmaier Date: Tue, 16 Apr 2019 11:30:42 +0000 Subject: [configlaoder] adjust to new column name --- server/api/configloader.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'server') diff --git a/server/api/configloader.js b/server/api/configloader.js index facb153..0e64dcf 100644 --- a/server/api/configloader.js +++ b/server/api/configloader.js @@ -46,7 +46,7 @@ noAuthRouter.getAsync('/:uuid', async (req, res) => { } importantEvents = importantEvents.filter(e => !blacklist.includes(e.id)) - importantEvents = importantEvents.map(e => e.config) + importantEvents = importantEvents.map(e => e.configId) importantEvents = importantEvents.filter(c => c !== null) importantEvents = importantEvents.filter(function (elem, pos, arr) { return arr.indexOf(elem) === pos }) if (importantEvents.length === 1) { @@ -61,7 +61,7 @@ noAuthRouter.getAsync('/:uuid', async (req, res) => { } events = events.filter(e => !blacklist.includes(e.id)) - events = events.map(e => e.config) + events = events.map(e => e.configId) events = events.filter(c => c !== null) events = events.filter(function (elem, pos, arr) { return arr.indexOf(elem) === pos }) @@ -207,7 +207,7 @@ async function fetchParentConfigs (groupIds, blacklist) { } importantEvents = importantEvents.filter(e => !newBlacklist.includes(e.id)) - importantEvents = importantEvents.map(e => e.config) + importantEvents = importantEvents.map(e => e.configId) importantEvents = importantEvents.filter(c => c !== null) importantEvents = importantEvents.filter(function (elem, pos, arr) { return arr.indexOf(elem) === pos }) if (importantEvents.length > 0) return { 'ids': importantEvents, 'type': 'important' } @@ -217,7 +217,7 @@ async function fetchParentConfigs (groupIds, blacklist) { if (response.type === 'important') return response events = events.filter(e => !newBlacklist.includes(e.id)) - events = events.map(e => e.config) + events = events.map(e => e.configId) events = events.filter(c => c !== null) events = events.filter(function (elem, pos, arr) { return arr.indexOf(elem) === pos }) if (events.length > 0) return { 'ids': events, 'type': 'event' } -- cgit v1.2.3-55-g7522 From f77e9c0cacf67b7e94bdd92a0208bebd69525619 Mon Sep 17 00:00:00 2001 From: Christian Hofmaier Date: Tue, 16 Apr 2019 11:47:02 +0000 Subject: [scheduler] make it work --- server/bin/scheduler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server') diff --git a/server/bin/scheduler.js b/server/bin/scheduler.js index 2ed4ed0..ab7ae21 100644 --- a/server/bin/scheduler.js +++ b/server/bin/scheduler.js @@ -70,7 +70,7 @@ async function wakeUpClients (id) { if (event.groups[i].group_x_event.blacklist) blacklistGroups.push(event.groups[i]) else groups.push(event.groups[i]) } - var childs = groupHelper.getAllChildren(groups, blacklistGroups, blacklistClients) + var childs = await groupHelper.getAllChildren(groups, blacklistGroups, blacklistClients) clients = clients.concat(childs.clients) // 2. Wake all clients -- cgit v1.2.3-55-g7522 From 6ef85a63e1efdb99ef390d9fd6d1d5da8ec9ec4b Mon Sep 17 00:00:00 2001 From: Christian Hofmaier Date: Tue, 16 Apr 2019 11:55:06 +0000 Subject: [scheduler] remove console log --- server/bin/scheduler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server') diff --git a/server/bin/scheduler.js b/server/bin/scheduler.js index ab7ae21..8bd8d80 100644 --- a/server/bin/scheduler.js +++ b/server/bin/scheduler.js @@ -75,6 +75,6 @@ async function wakeUpClients (id) { // 2. Wake all clients clients.forEach(client => { - wol.wake(client.mac, { address: client.ip.slice(0, client.ip.lastIndexOf('.') + 1) + '255' }, err => console.log(err)) + wol.wake(client.mac, { address: client.ip.slice(0, client.ip.lastIndexOf('.') + 1) + '255' }, err => { if (err) console.log(err) }) }) } -- cgit v1.2.3-55-g7522