sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix multiple clients causing all consoles to refresh

This commit is contained in:
Dane Everitt 2017-03-17 19:05:54 -04:00
parent 202dd52e2b
commit 0c6e6f39fe
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -23,6 +23,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
* `[pre.4]` — Fixes non-admin users being unable to create personal API keys. * `[pre.4]` — Fixes non-admin users being unable to create personal API keys.
* Fixes bug where daemon was unable to register that certain games had fully booted and were ready to play on. * Fixes bug where daemon was unable to register that certain games had fully booted and were ready to play on.
* Fixes bug causing MySQL user accounts to be corrupted when resetting a password via the panel. * Fixes bug causing MySQL user accounts to be corrupted when resetting a password via the panel.
* `[pre.4]` — Multiple clients refreshing the console no longer clears the console for all parties involved... sorry about that.
### Added ### Added
* Ability to assign multiple allocations at once when creating a new server. * Ability to assign multiple allocations at once when creating a new server.

12
public/themes/pterodactyl/js/frontend/console.js
View File

@ -24,6 +24,7 @@ var Console = (function () {
var terminalQueue; var terminalQueue;
var terminal; var terminal;
var recievedInitialLog = false;
var cpuChart; var cpuChart;
var cpuData; var cpuData;
@ -159,12 +160,13 @@ var Console = (function () {
function addSocketListeners() { function addSocketListeners() {
// Update Listings on Initial Status // Update Listings on Initial Status
Socket.on('initial status', function (data) { Socket.on('initial status', function (data) {
if (! recievedInitialLog) {
updateServerPowerControls(data.status); updateServerPowerControls(data.status);
terminal.clear();
if (data.status === 1 || data.status === 2) { if (data.status === 1 || data.status === 2) {
Socket.emit('send server log'); Socket.emit('send server log');
} }
}
}); });
// Update Listings on Status // Update Listings on Status
@ -172,6 +174,14 @@ var Console = (function () {
updateServerPowerControls(data.status); updateServerPowerControls(data.status);
}); });
Socket.on('server log', function (data) {
if (! recievedInitialLog) {
terminal.clear();
terminalQueue.push(data);
recievedInitialLog = true;
}
});
Socket.on('console', function (data) { Socket.on('console', function (data) {
terminalQueue.push(data.line); terminalQueue.push(data.line);
}); });