jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Make log lines backlog configurable

Browse Source
This commit is contained in:
Johannes Zellner
2017-08-08 10:07:33 +02:00
parent 96e2fa159c
commit 9f1af572a0
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webadmin/src/js/client.js
View File

@@ -1,6 +1,7 @@
'use strict';
/* global angular */
/* global EventSource */
angular.module('Application').service('Client', ['$http', 'md5', 'Notification', function ($http, md5, Notification) {
var client = null;
@@ -571,9 +572,9 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
}).error(defaultErrorHandler(callback));
};
Client.prototype.getPlatformLogs = function (units, follow, callback) {
Client.prototype.getPlatformLogs = function (units, follow, lines, callback) {
if (follow) {
var eventSource = new EventSource(client.apiOrigin + '/api/v1/cloudron/logstream?lines=10&access_token=' + token + '&units=' + units);
var eventSource = new EventSource(client.apiOrigin + '/api/v1/cloudron/logstream?lines=' + lines + '&access_token=' + token + '&units=' + units);
callback(null, eventSource);
} else {
get('/api/v1/cloudron/logs?lines=100&units=' + units).success(function (data, status) {
@@ -590,9 +591,9 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
}).error(defaultErrorHandler(callback));
};
Client.prototype.getAppLogs = function (appId, follow, callback) {
Client.prototype.getAppLogs = function (appId, follow, lines, callback) {
if (follow) {
var eventSource = new EventSource(client.apiOrigin + '/api/v1/apps/' + appId + '/logstream?lines=10&access_token=' + token);
var eventSource = new EventSource(client.apiOrigin + '/api/v1/apps/' + appId + '/logstream?lines=' + lines + '&access_token=' + token);
callback(null, eventSource);
} else {
get('/api/v1/apps/' + appId + '/logs').success(function (data, status) {

3
webadmin/src/views/logs.js
View File

@@ -9,6 +9,7 @@ angular.module('Application').controller('LogsController', ['$scope', '$location
$scope.logs = [];
$scope.selected = '';
$scope.activeEventSource = null;
$scope.lines = 10;
function ab2str(buf) {
return String.fromCharCode.apply(null, new Uint16Array(buf));
@@ -36,7 +37,7 @@ angular.module('Application').controller('LogsController', ['$scope', '$location
}
var func = newVal.type === 'platform' ? Client.getPlatformLogs : Client.getAppLogs;
func(newVal.value, true, function handleLogs(error, result) {
func(newVal.value, true, $scope.lines, function handleLogs(error, result) {
if (error) return console.error(error);
var logViewer = $('.log-line-container');