Alex/Pterodactyl-Panel
1
1
Fork 1
mirror of https://github.com/pterodactyl/panel.git synced 2024-11-26 11:02:31 +01:00
Code Issues Releases Wiki Activity

Rebase

Browse Source
This commit is contained in:
Dane Everitt 2016-10-27 20:14:24 -04:00
parent 6fd7c78f0c
commit ff93d6ce16
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example
View File

@ -5,6 +5,8 @@ APP_THEME=default
APP_TIMEZONE=UTC APP_TIMEZONE=UTC
APP_CLEAR_TASKLOG=720 APP_CLEAR_TASKLOG=720
APP_DELETE_MINUTES=10 APP_DELETE_MINUTES=10
CONSOLE_PUSH_FREQ=250
CONSOLE_PUSH_COUNT=10
DB_HOST=localhost DB_HOST=localhost
DB_PORT=3306 DB_PORT=3306

14
public/themes/default/css/pterodactyl.css
View File

@ -271,3 +271,17 @@ li.btn.btn-default.pill:active,li.btn.btn-default.pill:focus,li.btn.btn-default.
.fuelux .wizard .steps-container { .fuelux .wizard .steps-container {
background-color: #eee; background-color: #eee;
} }
#consoleThrottled {
z-index: 999;
top: 0px;
opacity: 0.6;
left: 0;
position: absolute;
margin: 0 15px;
border-radius: 4px 4px 0 0;
}
#consoleThrottled:hover {
opacity: 1;
}

25
resources/views/server/index.blade.php
View File

@ -48,7 +48,11 @@
<div class="panel-body"> <div class="panel-body">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div id="terminal"></div> <div class="alert alert-info hidden" id="consoleThrottled">
The console is currently being throttled due to the speed at which data is being sent. Messages are being queued and will appear as the queue is worked through.
</div>
<div id="terminal">
</div>
</div> </div>
<div class="col-md-12" style="text-align:center;"> <div class="col-md-12" style="text-align:center;">
<hr /> <hr />
@ -364,10 +368,27 @@ $(window).load(function () {
}); });
// New Console Data Recieved // New Console Data Recieved
var outputQueue = [];
socket.on('console', function (data) { socket.on('console', function (data) {
terminal.echo(data.line); outputQueue.push(data.line);
}); });
window.setInterval(pushOutputQueue, {{ env('CONSOLE_PUSH_FREQ', 250) }});
function pushOutputQueue()
{
if (outputQueue.length > {{ env('CONSOLE_PUSH_COUNT', 10) }}) {
$('#consoleThrottled').removeClass('hidden');
} else {
$('#consoleThrottled').addClass('hidden');
}
for (var i = 0; i < {{ env('CONSOLE_PUSH_COUNT', 10) }}; i++)
{
terminal.echo(outputQueue[0]);
outputQueue.shift();
}
}
// Update Listings on Initial Status // Update Listings on Initial Status
socket.on('initial_status', function (data) { socket.on('initial_status', function (data) {
currentStatus = data.status; currentStatus = data.status;