From 47c76b5583eb6daa0b4374b9a3cea18f800d1251 Mon Sep 17 00:00:00 2001 From: Michele Marcucci Date: Thu, 12 Aug 2021 15:11:23 +0200 Subject: [PATCH] Timezone hack --- btc-miner-test-server.js | 2 +- src/store/api/mcu/mcuUpdate.js | 20 ++++++++++---------- src/store/api/miner/minerStats.js | 6 ++++++ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/btc-miner-test-server.js b/btc-miner-test-server.js index a99bb20..e68eee8 100644 --- a/btc-miner-test-server.js +++ b/btc-miner-test-server.js @@ -101,7 +101,7 @@ function getData() { "interval": 591202, "jobs": 21681, "cleanFlags": 1040, - "sharesSent": 122077, + "sharesSent": getRandomArbitrary(4000, 45000), "sharesAccepted": 121988, "sharesRejected": 89, "solutionsAccepted": "516223196", diff --git a/src/store/api/mcu/mcuUpdate.js b/src/store/api/mcu/mcuUpdate.js index 20b9ebd..0d6686b 100644 --- a/src/store/api/mcu/mcuUpdate.js +++ b/src/store/api/mcu/mcuUpdate.js @@ -8,18 +8,18 @@ module.exports = ({ define }) => { const updateScript = join(__dirname, '..', '..', '..', '..', 'backend', scriptName) const cmd = spawn('sudo', ['bash', updateScript]) - cmd.stdout.on('data', (data) => { - console.log(`stdout: ${data}`); - }); + cmd.stdout.on('data', (data) => { + console.log(`stdout: ${data}`); + }); - cmd.stderr.on('data', (data) => { - console.error(`stderr: ${data}`); - }); + cmd.stderr.on('data', (data) => { + console.error(`stderr: ${data}`); + }); - cmd.on('close', (code) => { - console.log(`child process exited with code ${code}`); - return; - }); + cmd.on('close', (code) => { + console.log(`child process exited with code ${code}`); + return; + }); }, { auth: true }) diff --git a/src/store/api/miner/minerStats.js b/src/store/api/miner/minerStats.js index 4af5378..b4126b1 100644 --- a/src/store/api/miner/minerStats.js +++ b/src/store/api/miner/minerStats.js @@ -3,6 +3,7 @@ const { exec } = require('child_process') const fs = require('fs').promises const path = require('path') const _ = require('lodash') +const moment = require('moment') module.exports = ({ define }) => { define('stats', async (payload, { knex, errors, utils }) => { @@ -55,6 +56,11 @@ async function getMinerStats (errors) { return `int_${name}` }); + // Hack to add timezone to miner date + let offset = new Date().getTimezoneOffset(); + offset *= -1 + received.date = moment(`${received.date}`, 'YYYY-MM-DD HH:mm:ss').utcOffset(offset).format(); + stats.push(received); }));