From 34ed0c5c0f85f620c1306db109b7f9fd69a4248f Mon Sep 17 00:00:00 2001 From: Jannik Schönartz Date: Sun, 10 Mar 2019 02:24:33 +0000 Subject: [ipxe] Add parameter to api how many lines the response should send and adjust frontend --- server/api/ipxe.js | 12 ++++++-- webapp/src/components/IpxeBuilderModuleConfig.vue | 34 ++++++++++------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/server/api/ipxe.js b/server/api/ipxe.js index 6367246..79b3b7f 100644 --- a/server/api/ipxe.js +++ b/server/api/ipxe.js @@ -28,12 +28,18 @@ router.get('/:version/console', (req, res) => { }) router.get('/:version/log', async (req, res) => { + const max = req.query.max ? req.query.max : -1 res.setHeader('content-type', 'text/plain') const filepath = path.join(__appdir, 'ipxe', 'log_' + req.params.version + '.txt') - res.sendFile(filepath, err => { - if (err) { - res.end() + + fs.readFile(filepath, 'utf-8', function (err, content) { + if (err) res.end() + if (max !== -1 && content) { + let c = content.split('\n') + c = c.splice(-max) + res.send(c.join('\n')) } + else res.send(content) }) }) diff --git a/webapp/src/components/IpxeBuilderModuleConfig.vue b/webapp/src/components/IpxeBuilderModuleConfig.vue index e802d13..6454d41 100644 --- a/webapp/src/components/IpxeBuilderModuleConfig.vue +++ b/webapp/src/components/IpxeBuilderModuleConfig.vue @@ -45,25 +45,26 @@