Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 15:59:41 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/master' into logs_tail

Browse source
This commit is contained in:
jonny64 2015-02-16 17:37:04 +00:00
commit 87131f4ae3
14 changed files with 403 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/components/containerLogs/containerLogsController.js
View file

@ -30,7 +30,7 @@ function($scope, $routeParams, $location, $anchorScroll, ContainerLogs, Containe
// Replace carriage returns twith newlines to clean up output
$scope.stdout = data.replace(/[\r]/g, '\n');
});
ContainerLogs.get($routeParams.id, {stdout: 0, stderr: 1}, function(data, status, headers, config) {
ContainerLogs.get($routeParams.id, {stdout: 0, stderr: 1, timestamps: $scope.showTimestamps}, function(data, status, headers, config) {
$scope.stderr = data.replace(/[\r]/g, '\n');
});
}