Skip to content

Commit 897338b

Browse files
committed
Show socketio error messages
1 parent e6ab6de commit 897338b

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

app/Traits/Controllers/JavascriptInjection.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public function injectJavascript($args = [], $overwrite = false)
5151
'uuidShort' => $server->uuidShort,
5252
'daemonSecret' => $token,
5353
],
54+
'server_token' => $token,
5455
'node' => [
5556
'fqdn' => $server->node->fqdn,
5657
'scheme' => $server->node->scheme,

public/themes/pterodactyl/js/frontend/server.socket.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,17 @@ var Server = (function () {
5757
'query': 'token=' + Pterodactyl.server.daemonSecret,
5858
});
5959

60+
Socket.on('error', function (err) {
61+
if(typeof notifySocketError !== 'object') {
62+
notifySocketError = $.notify({
63+
message: 'There was an error attempting to establish a WebSocket connection to the Daemon. This panel will not work as expected.<br /><br />' + err,
64+
}, {
65+
type: 'danger',
66+
delay: 0,
67+
});
68+
}
69+
});
70+
6071
Socket.io.on('connect_error', function (err) {
6172
if(typeof notifySocketError !== 'object') {
6273
notifySocketError = $.notify({

0 commit comments

Comments
 (0)