dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-05-02 16:03:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

byline parsing script output

Browse Source
This commit is contained in:
Jan Prochazka
2020-06-10 20:44:31 +02:00
parent eb7c65dc95
commit 26120969de
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/api/package.json
View File

@@ -9,6 +9,7 @@
"axios": "^0.19.0", "axios": "^0.19.0",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"bufferutil": "^4.0.1", "bufferutil": "^4.0.1",
"byline": "^5.0.0",
"cors": "^2.8.5", "cors": "^2.8.5",
"cross-env": "^6.0.3", "cross-env": "^6.0.3",
"csv": "^5.3.2", "csv": "^5.3.2",

12
packages/api/src/controllers/runners.js
View File

@@ -2,6 +2,7 @@ const _ = require('lodash');
const path = require('path'); const path = require('path');
const fs = require('fs-extra'); const fs = require('fs-extra');
const uuidv1 = require('uuid/v1'); const uuidv1 = require('uuid/v1');
const byline = require('byline');
const socket = require('../utility/socket'); const socket = require('../utility/socket');
const { fork } = require('child_process'); const { fork } = require('child_process');
const { rundir, uploadsdir } = require('../utility/directories'); const { rundir, uploadsdir } = require('../utility/directories');
@@ -55,15 +56,10 @@ module.exports = {
}, },
}); });
const pipeDispatcher = (severity) => (data) => const pipeDispatcher = (severity) => (data) =>
data this.dispatchMessage(runid, { severity, message: data.toString().trim() });
.toString()
.split('\n')
.forEach((message) => {
if (message.trim()) this.dispatchMessage(runid, { severity, message: message.trim() });
});
subprocess.stdout.on('data', pipeDispatcher('info')); byline(subprocess.stdout).on('data', pipeDispatcher('info'));
subprocess.stderr.on('data', pipeDispatcher('error')); byline(subprocess.stderr).on('data', pipeDispatcher('error'));
subprocess.on('exit', (code) => { subprocess.on('exit', (code) => {
socket.emit(`runner-done-${runid}`, code); socket.emit(`runner-done-${runid}`, code);
}); });

5
yarn.lock
View File

@@ -2793,6 +2793,11 @@ builtin-status-codes@^3.0.0:
resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
byline@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=
bytes@3.0.0: bytes@3.0.0:
version "3.0.0" version "3.0.0"
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"