Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 04:15:28 +02:00
Code Issues Releases Activity

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

Browse source 
* 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
This commit is contained in:
pc 2018-10-29 12:49:35 +08:00 • committed by Anthony Lapenna
parent a61654a35d
commit 8df64031e8
12 changed files with 39 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/docker/services/serviceService.js
View file

@ -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'
};