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

Rename logs view to debug view

Browse Source
This commit is contained in:
Johannes Zellner
2017-08-17 09:30:31 +02:00
committed by Girish Ramakrishnan
parent 4b41378d08
commit 82f512dc27
4 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webadmin/src/index.html
View File

@@ -222,10 +222,10 @@
<li><a href="#/account"><i class="fa fa-user fa-fw"></i> Account</a></li>
<li ng-show="user.admin"><a href="#/activity"><i class="fa fa-list-alt fa-fw"></i> Activity</a></li>
<li ng-show="user.admin"><a href="#/tokens"><i class="fa fa-key fa-fw"></i> API Access</a></li>
<li ng-show="user.admin"><a href="#/debug"><i class="fa fa-terminal fa-fw"></i> Debug</a></li>
<li ng-show="user.admin"><a href="#/certs"><i class="fa fa-certificate fa-fw"></i> Domain & Certs</a></li>
<li ng-show="user.admin"><a href="#/email"><i class="fa fa-envelope fa-fw"></i> Email</a></li>
<li ng-show="user.admin"><a href="#/graphs"><i class="fa fa-bar-chart fa-fw"></i> Graphs</a></li>
<li ng-show="user.admin"><a href="#/logs"><i class="fa fa-file-text fa-fw"></i> Logs</a></li>
<li ng-show="user.admin"><a href="#/settings"><i class="fa fa-wrench fa-fw"></i> Settings</a></li>
<li ng-show="user.admin" class="divider"></li>
<li ng-show="user.admin"><a href="#/support"><i class="fa fa-comment fa-fw"></i> Support</a></li>

6
webadmin/src/js/index.js
View File

@@ -43,9 +43,9 @@ app.config(['$routeProvider', function ($routeProvider) {
}).when('/graphs', {
controller: 'GraphsController',
templateUrl: 'views/graphs.html'
}).when('/logs', {
controller: 'LogsController',
templateUrl: 'views/logs.html'
}).when('/debug', {
controller: 'DebugController',
templateUrl: 'views/debug.html'
}).when('/certs', {
controller: 'CertsController',
templateUrl: 'views/certs.html'

7
webadmin/src/views/logs.html → webadmin/src/views/debug.html
View File

@@ -7,7 +7,14 @@
<uib-tab index="1" heading="Terminal" select="showTerminal()"></uib-tab>
</uib-tabset>
<select class="form-control pull-right inline" ng-options="log.name for log in logs track by log.value" ng-model="selected"></select>
<!-- logs actions -->
<a class="btn btn-default pull-right" ng-href="{{ selected.url }}&format=short&lines=800" ng-hide="terminalVisible"><i class="fa fa-download"></i> Download </a>
<!-- terminal actions -->
<!-- <button class="btn btn-default pull-right" ng-click="" ng-show="terminalVisible">Upload</button> -->
<!-- <button class="btn btn-default pull-right" ng-click="" ng-show="terminalVisible">Download</button> -->
<button class="btn btn-default pull-right" ng-click="terminalInjectMysql()" ng-show="terminalVisible">Mysql</button>
</div>
</div>

37
webadmin/src/views/logs.js → webadmin/src/views/debug.js
View File

@@ -3,7 +3,7 @@
/* global moment */
/* global Terminal */
angular.module('Application').controller('LogsController', ['$scope', '$location', 'Client', function ($scope, $location, Client) {
angular.module('Application').controller('DebugController', ['$scope', '$location', 'Client', function ($scope, $location, Client) {
Client.onReady(function () { if (!Client.getUserInfo().admin) $location.path('/'); });
$scope.config = Client.getConfig();
@@ -13,6 +13,7 @@ angular.module('Application').controller('LogsController', ['$scope', '$location
$scope.selected = '';
$scope.activeEventSource = null;
$scope.terminal = null;
$scope.terminalSocket = null;
$scope.lines = 10;
$scope.terminalVisible = false;
@@ -46,6 +47,10 @@ angular.module('Application').controller('LogsController', ['$scope', '$location
$scope.terminal.destroy();
$scope.terminal = null;
}
if ($scope.terminalSocket) {
$scope.terminalSocket = null;
}
}
$scope.showLogs = function () {
@@ -81,22 +86,31 @@ angular.module('Application').controller('LogsController', ['$scope', '$location
});
};
$scope.showTerminal = function () {
$scope.showTerminal = function (retry) {
$scope.terminalVisible = true;
reset();
// we can only connect to apps here
if ($scope.selected.type !== 'app') {
var tmp = $('.logs-and-term-container');
var logLine = $('<div class="log-line">');
logLine.html('Terminal is only supported for app, not for ' + $scope.selected.name);
tmp.append(logLine);
return;
}
$scope.terminal = new Terminal();
try {
// websocket cannot use relative urls
var url = Client.apiOrigin.replace('https', 'wss') + '/api/v1/apps/' + $scope.selected.value + '/exec?tty=true';
var socket = new WebSocket(url);
$scope.terminal.attach(socket);
var url = Client.apiOrigin.replace('https', 'wss') + '/api/v1/apps/' + $scope.selected.value + '/execws?tty=true';
$scope.terminalSocket = new WebSocket(url);
$scope.terminal.attach($scope.terminalSocket);
socket.onclose = function () {
$scope.terminalSocket.onclose = function () {
// retry in one second
setTimeout($scope.showTerminal, 1000);
setTimeout($scope.showTerminal.bind(null, true), 1000);
};
} catch (e) {
console.error(e);
@@ -104,6 +118,15 @@ angular.module('Application').controller('LogsController', ['$scope', '$location
$scope.terminal.open(document.querySelector('.logs-and-term-container'));
$scope.terminal.fit();
if (retry) $scope.terminal.writeln('Reconnecting...');
else $scope.terminal.writeln('Connecting...');
};
$scope.terminalInjectMysql = function () {
if (!$scope.terminalSocket) return;
$scope.terminalSocket.send('mysql --user=${MYSQL_USERNAME} --password=${MYSQL_PASSWORD} --host=${MYSQL_HOST} ${MYSQL_DATABASE}\n');
};
$scope.$watch('selected', function (newVal) {