mirror of
https://thingvellir.net/git/overte
synced 2025-03-27 23:52:03 +01:00
Fix log.js style
This commit is contained in:
parent
daa17eadac
commit
d36efad6fe
3 changed files with 71 additions and 36 deletions
67
console/src/log.css
Normal file
67
console/src/log.css
Normal file
|
@ -0,0 +1,67 @@
|
|||
@font-face {
|
||||
font-family: 'Proxima Nova';
|
||||
src: url('vendor/ProximaNova/ProximaNova-Regular.otf');
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: "Proxima Nova", "Open Sans", Arial, Helvetica, sans-serif;
|
||||
line-height: 1.6;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
ul.tabs {
|
||||
margin: 0;
|
||||
padding: 0px;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
ul.tabs li {
|
||||
background: none;
|
||||
color: #222;
|
||||
display: inline-block;
|
||||
padding: 10px 15px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
ul.tabs li.current {
|
||||
background-color: #ededed;
|
||||
color: #222;
|
||||
}
|
||||
|
||||
.tab-pane {
|
||||
display: none;
|
||||
background-color: #ededed;
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
left: 0;
|
||||
}
|
||||
|
||||
.tab-pane.current {
|
||||
display: inherit;
|
||||
}
|
||||
|
||||
.tab-content {
|
||||
overflow: auto;
|
||||
padding: 10px;
|
||||
background-color: #ededed;
|
||||
}
|
||||
|
||||
.top {
|
||||
height: 45px;
|
||||
}
|
||||
|
||||
.bottom {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 45px;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
}
|
||||
|
||||
.search {
|
||||
float: right;
|
||||
margin: 10px;
|
||||
}
|
|
@ -16,7 +16,7 @@
|
|||
<li class="tab-link" data-tab="assignment-client">Assignment Clients</li>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content middle">
|
||||
<div class="tab-content bottom">
|
||||
<div class="tab-pane" id="domain-server">
|
||||
</div>
|
||||
<div class="tab-pane" id="assignment-client">
|
||||
|
|
|
@ -127,7 +127,6 @@ ready = function() {
|
|||
domainServer.on('logs-updated', updateLogFiles);
|
||||
acMonitor.on('logs-updated', updateLogFiles);
|
||||
|
||||
updateLogFiles();
|
||||
|
||||
const maxLogLines = 2500;
|
||||
const ipcRenderer = require('electron').ipcRenderer;
|
||||
|
@ -174,22 +173,6 @@ ready = function() {
|
|||
|
||||
var filter = "";
|
||||
|
||||
var times = {};
|
||||
var t = null;
|
||||
function start() {
|
||||
t = Date.now();
|
||||
}
|
||||
function stop(name) {
|
||||
if (!(name in times)) times[name] = 0;
|
||||
times[name] += (Date.now() - t);
|
||||
}
|
||||
|
||||
function printTimes() {
|
||||
for (var k in times) {
|
||||
console.log(k, times[k] / 1000, 's');
|
||||
}
|
||||
}
|
||||
|
||||
// Register for log events
|
||||
// Process added
|
||||
|
||||
|
@ -199,48 +182,33 @@ ready = function() {
|
|||
|
||||
function appendLogMessage(pid, msg, name) {
|
||||
console.log(pid, msg, name);
|
||||
start();
|
||||
var id = "pid-" + pid;
|
||||
id = name == "ds" ? "domain-server" : "assignment-client";
|
||||
var $pidLog = $('#' + id);
|
||||
stop('acquire');
|
||||
|
||||
start();
|
||||
// var $logLines = $pidLog.children();
|
||||
// var removed = false;
|
||||
var size = ++tabStates[id].size;
|
||||
stop('get size');
|
||||
start();
|
||||
if (size > maxLogLines) {
|
||||
// $logLines.first().remove();
|
||||
$pidLog.find('div.log-line:first').remove();
|
||||
removed = true;
|
||||
}
|
||||
stop('remove first');
|
||||
|
||||
start();
|
||||
var wasAtBottom = false;
|
||||
if (currentTab == id) {
|
||||
var padding = 15;
|
||||
wasAtBottom = $pidLog[0].scrollTop >= ($pidLog[0].scrollHeight - $pidLog.height() - (2 * padding));
|
||||
}
|
||||
stop('scrollCheck');
|
||||
|
||||
start();
|
||||
var $logLine = $('<div class="log-line">').text(msg);
|
||||
stop('create');
|
||||
if (!shouldDisplayLogMessage(msg)) {
|
||||
$logLine.hide();
|
||||
}
|
||||
start();
|
||||
$pidLog.append($logLine);
|
||||
stop('append');
|
||||
|
||||
start();
|
||||
$pidLog.append($logLine);
|
||||
|
||||
if (wasAtBottom) {
|
||||
$pidLog.scrollTop($pidLog[0].scrollHeight);
|
||||
}
|
||||
stop('scroll');
|
||||
|
||||
}
|
||||
|
||||
|
@ -261,5 +229,5 @@ ready = function() {
|
|||
}
|
||||
});
|
||||
|
||||
setInterval(printTimes, 10000);
|
||||
updateLogFiles();
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue