github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #81 from kevana/master 

Add timestamp option to stderr
pull/2/head
Kevan Ahlquist 2015-02-09 23:02:01 -06:00
parent d11c849a0f c7ebe9d881
commit 4d9d66e9f9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ function($scope, $routeParams, $location, $anchorScroll, ContainerLogs, Containe
// Replace carriage returns twith newlines to clean up output // Replace carriage returns twith newlines to clean up output
$scope.stdout = data.replace(/[\r]/g, '\n'); $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'); $scope.stderr = data.replace(/[\r]/g, '\n');
}); });
} }

2
dist/dockerui.js vendored
View File

@ -159,7 +159,7 @@ function($scope, $routeParams, $location, $anchorScroll, ContainerLogs, Containe
// Replace carriage returns twith newlines to clean up output // Replace carriage returns twith newlines to clean up output
$scope.stdout = data.replace(/[\r]/g, '\n'); $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'); $scope.stderr = data.replace(/[\r]/g, '\n');
}); });
} }