Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-04 13:25:26 +02:00
Code Issues Releases Activity

fix(log-viewer): strip headers in container logs when TTY is disabled (#1861)

Browse source
This commit is contained in:
Anthony Lapenna 2018-05-04 09:45:05 +02:00 • committed by GitHub
parent 1e55ada6af
commit e0cf088428
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 81 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/docker/rest/response/handlers.js
View file

@ -45,15 +45,11 @@ function genericHandler(data) {
}
// The Docker API returns the logs as a single string.
// This handler will return an array with each line being an entry.
// It will also strip the 8 first characters of each line and remove any ANSI code related character sequences.
// This handler wraps the data in a JSON object under the "logs" property.
function logsHandler(data) {
var logs = data;
logs = logs.substring(8);
logs = logs.replace(/\n(.{8})/g, '\n\r');
logs = logs.replace(
/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '');
return logs.split('\n');
return {
logs: data
};
}
// Image delete API returns an array on success (Docker 1.9 -> Docker 1.12).