dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

Show socketio error messages

Browse Source
This commit is contained in:
Dane Everitt 2017-11-18 16:50:08 -06:00
parent e6ab6de3e5
commit 897338bfa7
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Traits/Controllers/JavascriptInjection.php
View File

@ -51,6 +51,7 @@ trait JavascriptInjection
'uuidShort' => $server->uuidShort, 'uuidShort' => $server->uuidShort,
'daemonSecret' => $token, 'daemonSecret' => $token,
], ],
'server_token' => $token,
'node' => [ 'node' => [
'fqdn' => $server->node->fqdn, 'fqdn' => $server->node->fqdn,
'scheme' => $server->node->scheme, 'scheme' => $server->node->scheme,

11
public/themes/pterodactyl/js/frontend/server.socket.js
View File

@ -57,6 +57,17 @@ var Server = (function () {
'query': 'token=' + Pterodactyl.server.daemonSecret, 'query': 'token=' + Pterodactyl.server.daemonSecret,
}); });
Socket.on('error', function (err) {
if(typeof notifySocketError !== 'object') {
notifySocketError = $.notify({
message: 'There was an error attempting to establish a WebSocket connection to the Daemon. This panel will not work as expected.<br /><br />' + err,
}, {
type: 'danger',
delay: 0,
});
}
});
Socket.io.on('connect_error', function (err) { Socket.io.on('connect_error', function (err) {
if(typeof notifySocketError !== 'object') { if(typeof notifySocketError !== 'object') {
notifySocketError = $.notify({ notifySocketError = $.notify({