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

Merge commit '974ed1fe0598533747c2cf4c2f21d7830d484431' 

Conflicts:
	app/components/containerLogs/containerLogsController.js
pull/2/head
Kevan Ahlquist 2015-02-24 23:32:38 -06:00
parent 22cdb94e5d 974ed1fe05
commit fb0a0827b6
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ function($scope, $routeParams, $location, $anchorScroll, ContainerLogs, Containe
$scope.stdout = ''; $scope.stdout = '';
$scope.stderr = ''; $scope.stderr = '';
$scope.showTimestamps = false; $scope.showTimestamps = false;
$scope.tailLines = 2000;
ViewSpinner.spin(); ViewSpinner.spin();
Container.get({id: $routeParams.id}, function(d) { Container.get({id: $routeParams.id}, function(d) {
@ -19,21 +20,35 @@ function($scope, $routeParams, $location, $anchorScroll, ContainerLogs, Containe
}); });
function getLogs() { function getLogs() {
ContainerLogs.get($routeParams.id, {stdout: 1, stderr: 0, timestamps: $scope.showTimestamps}, function(data, status, headers, config) { ViewSpinner.spin();
ContainerLogs.get($routeParams.id, {
stdout: 1,
stderr: 0,
timestamps: $scope.showTimestamps,
tail: $scope.tailLines
}, function(data, status, headers, config) {
// Replace carriage returns with newlines to clean up output // Replace carriage returns with newlines to clean up output
data = data.replace(/[\r]/g, '\n') data = data.replace(/[\r]/g, '\n')
// Strip 8 byte header from each line of output // Strip 8 byte header from each line of output
data = data.substring(8); data = data.substring(8);
data = data.replace(/\n(.{8})/g, '\n'); data = data.replace(/\n(.{8})/g, '\n');
$scope.stdout = data; $scope.stdout = data;
ViewSpinner.stop();
}); });
ContainerLogs.get($routeParams.id, {stdout: 0, stderr: 1, timestamps: $scope.showTimestamps}, function(data, status, headers, config) {
ContainerLogs.get($routeParams.id, {
stdout: 0,
stderr: 1,
timestamps: $scope.showTimestamps,
tail: $scope.tailLines
}, function(data, status, headers, config) {
// Replace carriage returns with newlines to clean up output // Replace carriage returns with newlines to clean up output
data = data.replace(/[\r]/g, '\n') data = data.replace(/[\r]/g, '\n')
// Strip 8 byte header from each line of output // Strip 8 byte header from each line of output
data = data.substring(8); data = data.substring(8);
data = data.replace(/\n(.{8})/g, '\n'); data = data.replace(/\n(.{8})/g, '\n');
$scope.stderr = data; $scope.stderr = data;
ViewSpinner.stop();
}); });
} }
@ -54,4 +69,8 @@ function($scope, $routeParams, $location, $anchorScroll, ContainerLogs, Containe
$scope.toggleTimestamps = function() { $scope.toggleTimestamps = function() {
getLogs(); getLogs();
}; };
$scope.toggleTail = function() {
getLogs();
};
}]); }]);

14
app/components/containerLogs/containerlogs.html
View File

@ -5,9 +5,17 @@
<button class="btn btn-info" ng-click="scrollTo('stdout')">stdout</button> <button class="btn btn-info" ng-click="scrollTo('stdout')">stdout</button>
<button class="btn btn-warning" ng-click="scrollTo('stderr')">stderr</button> <button class="btn btn-warning" ng-click="scrollTo('stderr')">stderr</button>
</div> </div>
<div class="pull-right"> <div class="pull-right col-xs-6">
<input id="timestampToggle" type="checkbox" ng-model="showTimestamps" <div class="col-xs-6">
ng-change="toggleTimestamps()"/> <label for="timestampToggle">Display Timestamps</label> <a class="btn btn-primary" ng-click="toggleTail()" role="button">Reload logs</a>
<input id="tailLines" type="number" ng-style="{width: '45px'}"
ng-model="tailLines" ng-keypress="($event.which === 13)? toggleTail() : 0"/>
<label for="tailLines">lines</label>
</div>
<div class="col-xs-4">
<input id="timestampToggle" type="checkbox" ng-model="showTimestamps"
ng-change="toggleTimestamps()"/> <label for="timestampToggle">Timestamps</label>
</div>
</div> </div>
</div> </div>