feat(log-viewer): change line count default to 100 and add a since parameter (#2377)

* chore(log-viewer): add the ability to use`since` parameter #1942 https://github.com/portainer/portainer/issues/1942#issuecomment-430246378 * chore(log-viewer): change lineCount to 100 #1942 https://github.com/portainer/portainer/issues/1942#issuecomment-430246378 * fix(log-viewer): js syntax typo for `;` and `'` forget to lint the code, reported by codeclimate * fix(log-viewer): use mementjs to format timestamp 1. use moment lib instead of define a function in filter.js(not the right place for this function, removed) 2. set sinceTimestamp init value to `24 hours ago`, as we just need to focus on the relative latest logs after the log-viewer loading, not all the logs(to speedup the process) 3. use moment().unix() to convert the `sinceTimestamp` to local unix timestamp(not utc) * chore(log-viewer): add the ability to select the datetime for `since` * chore(log-viewer): add the ability to fetch logs from specific time
2018-10-29 12:49:35 +08:00 · 2018-10-29 12:49:35 +08:00 · 8df64031e8
parent a61654a35d
commit 8df64031e8
12 changed files with 39 additions and 15 deletions
--- a/app/docker/components/log-viewer/log-viewer.js
+++ b/app/docker/components/log-viewer/log-viewer.js
@ -5,6 +5,7 @@ angular.module('portainer.docker').component('logViewer', {
    data: '=',
    displayTimestamps: '=',
    logCollectionChange: '<',
+    sinceTimestamp: '=',
    lineCount: '='
  }
 });
--- a/app/docker/components/log-viewer/logViewer.html
+++ b/app/docker/components/log-viewer/logViewer.html
@ -35,6 +35,17 @@
               </label>
            </div>
          </div>
+          <div class="form-group">
+            <label for="logs_since" class="col-sm-1 control-label text-left">
+              Fetch
+            </label>
+            <div class="col-sm-2">
+              <select class="form-control" ng-model="$ctrl.sinceTimestamp" id="logs_since">
+                <option selected value="">All logs</option>
+                <option ng-repeat="dt in $ctrl.state.availableSinceDatetime" ng-value="dt.value" title="{{ dt.value }}">{{ dt.desc }}</option>
+              </select>
+            </div>
+          </div>
          <div class="form-group">
            <label for="logs_search" class="col-sm-1 control-label text-left">
              Search
--- a/app/docker/components/log-viewer/logViewerController.js
+++ b/app/docker/components/log-viewer/logViewerController.js
@ -3,6 +3,12 @@ angular.module('portainer.docker')
 function (clipboard) {

  this.state = {
+    availableSinceDatetime: [
+      { desc: 'Last day', value: moment().subtract(1, 'days').format() },
+      { desc: 'Last 4 hours', value: moment().subtract(4, 'hours').format() },
+      { desc: 'Last hour', value: moment().subtract(1, 'hours').format() },
+      { desc: 'Last 10 minutes', value: moment().subtract(10, 'minutes').format() }
+    ],
    copySupported: clipboard.supported,
    logCollection: true,
    autoScroll: true,
--- a/app/docker/services/containerService.js
+++ b/app/docker/services/containerService.js
@ -140,7 +140,7 @@ function ContainerServiceFactory($q, Container, ResourceControlService, LogHelpe
    return deferred.promise;
  };

-  service.logs = function(id, stdout, stderr, timestamps, tail, stripHeaders) {
+  service.logs = function(id, stdout, stderr, timestamps, since, tail, stripHeaders) {
    var deferred = $q.defer();

    var parameters = {
@ -148,6 +148,7 @@ function ContainerServiceFactory($q, Container, ResourceControlService, LogHelpe
      stdout: stdout || 0,
      stderr: stderr || 0,
      timestamps: timestamps || 0,
+      since: since || 0,
      tail: tail || 'all'
    };

--- a/app/docker/services/serviceService.js
+++ b/app/docker/services/serviceService.js
@ -59,7 +59,7 @@ function ServiceServiceFactory($q, Service, ServiceHelper, TaskService, Resource
    return Service.update({ id: service.Id, version: service.Version }, config).$promise;
  };

-  service.logs = function(id, stdout, stderr, timestamps, tail) {
+  service.logs = function(id, stdout, stderr, timestamps, since, tail) {
    var deferred = $q.defer();

    var parameters = {
@ -67,6 +67,7 @@ function ServiceServiceFactory($q, Service, ServiceHelper, TaskService, Resource
      stdout: stdout || 0,
      stderr: stderr || 0,
      timestamps: timestamps || 0,
+      since: since || 0,
      tail: tail || 'all'
    };

--- a/app/docker/services/taskService.js
+++ b/app/docker/services/taskService.js
@ -36,7 +36,7 @@ function TaskServiceFactory($q, Task, LogHelper) {
    return deferred.promise;
  };

-  service.logs = function(id, stdout, stderr, timestamps, tail) {
+  service.logs = function(id, stdout, stderr, timestamps, since, tail) {
    var deferred = $q.defer();

    var parameters = {
@ -44,6 +44,7 @@ function TaskServiceFactory($q, Task, LogHelper) {
      stdout: stdout || 0,
      stderr: stderr || 0,
      timestamps: timestamps || 0,
+      since: since || 0,
      tail: tail || 'all'
    };

--- a/app/docker/views/containers/logs/containerLogsController.js
+++ b/app/docker/views/containers/logs/containerLogsController.js
@ -3,7 +3,8 @@ angular.module('portainer.docker')
 function ($scope, $transition$, $interval, ContainerService, Notifications, HttpRequestHelper) {
  $scope.state = {
    refreshRate: 3,
-    lineCount: 2000,
+    lineCount: 100,
+    sinceTimestamp: '',
    displayTimestamps: false
  };

@ -30,7 +31,7 @@ function ($scope, $transition$, $interval, ContainerService, Notifications, Http
  function setUpdateRepeater(skipHeaders) {
    var refreshRate = $scope.state.refreshRate;
    $scope.repeater = $interval(function() {
-      ContainerService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, $scope.state.lineCount, skipHeaders)
+      ContainerService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, moment($scope.state.sinceTimestamp).unix(), $scope.state.lineCount, skipHeaders)
      .then(function success(data) {
        $scope.logs = data;
      })
@ -42,7 +43,7 @@ function ($scope, $transition$, $interval, ContainerService, Notifications, Http
  }

  function startLogPolling(skipHeaders) {
-    ContainerService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, $scope.state.lineCount, skipHeaders)
+    ContainerService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, moment($scope.state.sinceTimestamp).unix(), $scope.state.lineCount, skipHeaders)
    .then(function success(data) {
      $scope.logs = data;
      setUpdateRepeater(skipHeaders);
--- a/app/docker/views/containers/logs/containerlogs.html
+++ b/app/docker/views/containers/logs/containerlogs.html
@ -6,5 +6,5 @@
 </rd-header>

 <log-viewer
-  data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps" line-count="state.lineCount"
+  data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps" line-count="state.lineCount" since-timestamp="state.sinceTimestamp"
 ></log-viewer>
--- a/app/docker/views/services/logs/serviceLogsController.js
+++ b/app/docker/views/services/logs/serviceLogsController.js
@ -3,7 +3,8 @@ angular.module('portainer.docker')
 function ($scope, $transition$, $interval, ServiceService, Notifications) {
  $scope.state = {
    refreshRate: 3,
-    lineCount: 2000,
+    lineCount: 100,
+    sinceTimestamp: '',
    displayTimestamps: false
  };

@ -30,7 +31,7 @@ function ($scope, $transition$, $interval, ServiceService, Notifications) {
  function setUpdateRepeater() {
    var refreshRate = $scope.state.refreshRate;
    $scope.repeater = $interval(function() {
-      ServiceService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, $scope.state.lineCount)
+      ServiceService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, moment($scope.state.sinceTimestamp).unix(), $scope.state.lineCount)
      .then(function success(data) {
        $scope.logs = data;
      })
@ -42,7 +43,7 @@ function ($scope, $transition$, $interval, ServiceService, Notifications) {
  }

  function startLogPolling() {
-    ServiceService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, $scope.state.lineCount)
+    ServiceService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, moment($scope.state.sinceTimestamp).unix(), $scope.state.lineCount)
    .then(function success(data) {
      $scope.logs = data;
      setUpdateRepeater();
--- a/app/docker/views/services/logs/servicelogs.html
+++ b/app/docker/views/services/logs/servicelogs.html
@ -6,5 +6,5 @@
 </rd-header>

 <log-viewer
-  data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps" line-count="state.lineCount"
+  data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps" line-count="state.lineCount" since-timestamp="state.sinceTimestamp"
 ></log-viewer>
--- a/app/docker/views/tasks/logs/taskLogsController.js
+++ b/app/docker/views/tasks/logs/taskLogsController.js
@ -3,7 +3,8 @@ angular.module('portainer.docker')
 function ($scope, $transition$, $interval, TaskService, ServiceService, Notifications) {
  $scope.state = {
    refreshRate: 3,
-    lineCount: 2000,
+    lineCount: 100,
+    sinceTimestamp: '',
    displayTimestamps: false
  };

@ -30,7 +31,7 @@ function ($scope, $transition$, $interval, TaskService, ServiceService, Notifica
  function setUpdateRepeater() {
    var refreshRate = $scope.state.refreshRate;
    $scope.repeater = $interval(function() {
-      TaskService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, $scope.state.lineCount)
+      TaskService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, moment($scope.state.sinceTimestamp).unix(), $scope.state.lineCount)
      .then(function success(data) {
        $scope.logs = data;
      })
@ -42,7 +43,7 @@ function ($scope, $transition$, $interval, TaskService, ServiceService, Notifica
  }

  function startLogPolling() {
-    TaskService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, $scope.state.lineCount)
+    TaskService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, moment($scope.state.sinceTimestamp).unix(), $scope.state.lineCount)
    .then(function success(data) {
      $scope.logs = data;
      setUpdateRepeater();
--- a/app/docker/views/tasks/logs/tasklogs.html
+++ b/app/docker/views/tasks/logs/tasklogs.html
@ -6,5 +6,5 @@
 </rd-header>

 <log-viewer
-  data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps" line-count="state.lineCount"
+  data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps" line-count="state.lineCount" since-timestamp="state.sinceTimestamp"
 ></log-viewer>