f4f296fc05
F1: stop emitting/committing an unfinished line in onEnd/onError reconnect
paths; since-based reconnect redelivers the full line.
F2: give service/task poll rows positionally-stable ids so track by log.id
reuses DOM rows and text selection survives the 3s poll.
F3/F4: tests for CRLF stripping and reconnect-dedup across separate chunks.
F5: correct the stale refreshRate comment.
F6: unroll the side-effecting IIFE-in-ternary into if/else.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
97 lines
3.3 KiB
JavaScript
97 lines
3.3 KiB
JavaScript
import moment from 'moment';
|
|
|
|
angular.module('portainer.docker').controller('TaskLogsController', [
|
|
'$scope',
|
|
'$transition$',
|
|
'$interval',
|
|
'TaskService',
|
|
'ServiceService',
|
|
'Notifications',
|
|
function ($scope, $transition$, $interval, TaskService, ServiceService, Notifications) {
|
|
$scope.state = {
|
|
refreshRate: 3,
|
|
lineCount: 100,
|
|
sinceTimestamp: '',
|
|
displayTimestamps: false,
|
|
};
|
|
|
|
$scope.changeLogCollection = function (logCollectionStatus) {
|
|
if (!logCollectionStatus) {
|
|
stopRepeater();
|
|
} else {
|
|
setUpdateRepeater();
|
|
}
|
|
};
|
|
|
|
$scope.$on('$destroy', function () {
|
|
stopRepeater();
|
|
});
|
|
|
|
function stopRepeater() {
|
|
var repeater = $scope.repeater;
|
|
if (angular.isDefined(repeater)) {
|
|
$interval.cancel(repeater);
|
|
}
|
|
}
|
|
|
|
function setUpdateRepeater() {
|
|
var refreshRate = $scope.state.refreshRate;
|
|
$scope.repeater = $interval(function () {
|
|
TaskService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, moment($scope.state.sinceTimestamp).unix(), $scope.state.lineCount)
|
|
.then(function success(data) {
|
|
// NOTE: task logs still poll and replace the whole array. Because
|
|
// formatLogs assigns fresh line ids per poll, `track by log.id` in
|
|
// the viewer re-renders every row each poll (a live text selection
|
|
// can collapse). The append-only live stream that fixes this exists
|
|
// only for container logs (issue #2); converting service/task logs
|
|
// to a live stream is out of scope here. Assign positionally-stable
|
|
// ids (0..N) so `track by log.id` reuses rows across polls (like the
|
|
// old `track by $index`) and a live text selection survives.
|
|
$scope.logs = data.map(function (line, i) {
|
|
return { ...line, id: i };
|
|
});
|
|
})
|
|
.catch(function error(err) {
|
|
stopRepeater();
|
|
Notifications.error('Failure', err, 'Unable to retrieve task logs');
|
|
});
|
|
}, refreshRate * 1000);
|
|
}
|
|
|
|
function startLogPolling() {
|
|
TaskService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, moment($scope.state.sinceTimestamp).unix(), $scope.state.lineCount)
|
|
.then(function success(data) {
|
|
// Positionally-stable ids so `track by log.id` reuses rows (see the
|
|
// poll handler above).
|
|
$scope.logs = data.map(function (line, i) {
|
|
return { ...line, id: i };
|
|
});
|
|
setUpdateRepeater();
|
|
})
|
|
.catch(function error(err) {
|
|
stopRepeater();
|
|
Notifications.error('Failure', err, 'Unable to retrieve task logs');
|
|
});
|
|
}
|
|
|
|
function initView() {
|
|
TaskService.task($transition$.params().id)
|
|
.then(function success(data) {
|
|
var task = data;
|
|
$scope.task = task;
|
|
return ServiceService.service(task.ServiceId);
|
|
})
|
|
.then(function success(data) {
|
|
var service = data;
|
|
$scope.service = service;
|
|
startLogPolling();
|
|
})
|
|
.catch(function error(err) {
|
|
Notifications.error('Failure', err, 'Unable to retrieve task details');
|
|
});
|
|
}
|
|
|
|
initView();
|
|
},
|
|
]);
|