From 8df64031e865da8978e2dfe1f7aa1bc744e0f61f Mon Sep 17 00:00:00 2001
From: pc <pc@pcswo.com>
Date: Mon, 29 Oct 2018 12:49:35 +0800
Subject: [PATCH] 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
---
 app/docker/components/log-viewer/log-viewer.js        |  1 +
 app/docker/components/log-viewer/logViewer.html       | 11 +++++++++++
 .../components/log-viewer/logViewerController.js      |  6 ++++++
 app/docker/services/containerService.js               |  3 ++-
 app/docker/services/serviceService.js                 |  3 ++-
 app/docker/services/taskService.js                    |  3 ++-
 .../views/containers/logs/containerLogsController.js  |  7 ++++---
 app/docker/views/containers/logs/containerlogs.html   |  2 +-
 .../views/services/logs/serviceLogsController.js      |  7 ++++---
 app/docker/views/services/logs/servicelogs.html       |  2 +-
 app/docker/views/tasks/logs/taskLogsController.js     |  7 ++++---
 app/docker/views/tasks/logs/tasklogs.html             |  2 +-
 12 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/app/docker/components/log-viewer/log-viewer.js b/app/docker/components/log-viewer/log-viewer.js
index 070567b9e..b0864aea4 100644
--- 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: '='
   }
 });
diff --git a/app/docker/components/log-viewer/logViewer.html b/app/docker/components/log-viewer/logViewer.html
index 9e1f95c02..44c1c5d7e 100644
--- 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
diff --git a/app/docker/components/log-viewer/logViewerController.js b/app/docker/components/log-viewer/logViewerController.js
index 9de38f318..b4c198b8c 100644
--- 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,
diff --git a/app/docker/services/containerService.js b/app/docker/services/containerService.js
index f7c2cb085..698ccd0dd 100644
--- 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'
     };
 
diff --git a/app/docker/services/serviceService.js b/app/docker/services/serviceService.js
index 94e8fa7bf..444d09287 100644
--- 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'
     };
 
diff --git a/app/docker/services/taskService.js b/app/docker/services/taskService.js
index 960b6bd70..b18b5814c 100644
--- 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'
     };
 
diff --git a/app/docker/views/containers/logs/containerLogsController.js b/app/docker/views/containers/logs/containerLogsController.js
index 1d23adeb8..633739f42 100644
--- 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);
diff --git a/app/docker/views/containers/logs/containerlogs.html b/app/docker/views/containers/logs/containerlogs.html
index 804731ec5..133e354c2 100644
--- 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>
diff --git a/app/docker/views/services/logs/serviceLogsController.js b/app/docker/views/services/logs/serviceLogsController.js
index 1e44ebb31..deb5c34bc 100644
--- 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();
diff --git a/app/docker/views/services/logs/servicelogs.html b/app/docker/views/services/logs/servicelogs.html
index 511732046..2544d2d94 100644
--- 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>
diff --git a/app/docker/views/tasks/logs/taskLogsController.js b/app/docker/views/tasks/logs/taskLogsController.js
index c25e1b1c2..19768de1d 100644
--- 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();
diff --git a/app/docker/views/tasks/logs/tasklogs.html b/app/docker/views/tasks/logs/tasklogs.html
index abfaa6d45..79c8f3028 100644
--- 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>