ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-06-21 16:49:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Standardise all supervisor output logging

Browse Source 
Also use the supervisor's own container logging monitoring code when
running livepush on the supervisor container.

Change-type: minor
Signed-off-by: Cameron Diver <cameron@balena.io>
This commit is contained in:
Cameron Diver
2019-05-30 23:30:49 +01:00
parent 2c1164cd62
commit 2276dd54e1
30 changed files with 917 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sync-debug.js
View File

@ -20,6 +20,20 @@ const dockerode = require('dockerode');
const chokidar = require('chokidar');
const _ = require('lodash');
require('ts-node/register');
const { ContainerLogs } = require('./src/logging/container');
const setupLogs = (containerId, docker) => {
console.log('Setting up logs');
const logs = new ContainerLogs(containerId, docker);
logs.on('log', ({ message }) => {
if (message.trim().length !== 0) {
console.log(message);
}
});
logs.attach(Date.now());
};
const docker = new dockerode({
host: ip,
port: 2375,
@ -53,10 +67,11 @@ function extractMessage(msgBuf) {
let changedFiles = [];
let deletedFiles = [];
const performLivepush = _.debounce(async livepush => {
const performLivepush = _.debounce(async (livepush, containerId, docker) => {
await livepush.performLivepush(changedFiles, deletedFiles);
changedFiles = [];
deletedFiles = [];
setupLogs(containerId, docker);
}, 1000);
(async () => {
@ -85,15 +100,15 @@ const performLivepush = _.debounce(async livepush => {
})
.on('add', path => {
changedFiles.push(path);
performLivepush(livepush);
performLivepush(livepush, containerId, docker);
})
.on('change', path => {
changedFiles.push(path);
performLivepush(livepush);
performLivepush(livepush, containerId, docker);
})
.on('unlink', path => {
deletedFiles.push(path);
performLivepush(livepush);
performLivepush(livepush, containerId, docker);
});
livepush.on('commandExecute', ({ command }) => {