Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix socket.io error

Browse source 
We no longer support self-signed certs, so if we cant connect 99%
chance the daemon is off.
This commit is contained in:
Dane Everitt 2016-01-05 01:19:59 -05:00
parent e552b788b4
commit 52a2f2e2ae
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Models/Node.php
View file

@ -79,7 +79,6 @@ class Node extends Model
'base_uri' => sprintf('%s://%s:%s/', $nodeData->scheme, $nodeData->fqdn, $nodeData->daemonListen), 'base_uri' => sprintf('%s://%s:%s/', $nodeData->scheme, $nodeData->fqdn, $nodeData->daemonListen),
'timeout' => 10.0, 'timeout' => 10.0,
'connect_timeout' => 5.0, 'connect_timeout' => 5.0,
'verify' => false,
]); ]);
return self::$guzzle[$node]; return self::$guzzle[$node];

2
resources/lang/en/server.php
View file

@ -9,7 +9,7 @@ return [
*/ */
'ajax' => [ 'ajax' => [
'socket_error' => 'We were unable to connect to the main Socket.IO server, there may be network issues currently. <br /><br />If this is your first time seeing this message it may be because you need to accept this servers SSL certificate. Please click this notification and accept the certificate.', 'socket_error' => 'We were unable to connect to the main Socket.IO server, there may be network issues currently. The panel may not work as expected.',
'socket_status' => 'This server\'s power status has changed to', 'socket_status' => 'This server\'s power status has changed to',
'socket_status_crashed' => 'This server has been detected as CRASHED.', 'socket_status_crashed' => 'This server has been detected as CRASHED.',
], ],

4
resources/views/layouts/master.blade.php
View file

@ -49,9 +49,7 @@
$('#applyUpdate').removeClass('fa-circle-o-notch fa-spinner fa-spin').addClass('fa-question-circle').css({ color: '#FF9900' }); $('#applyUpdate').removeClass('fa-circle-o-notch fa-spinner fa-spin').addClass('fa-question-circle').css({ color: '#FF9900' });
if(typeof notifySocketError !== 'object') { if(typeof notifySocketError !== 'object') {
notifySocketError = $.notify({ notifySocketError = $.notify({
message: '{!! trans('server.ajax.socket_error') !!}', message: '{!! trans('server.ajax.socket_error') !!}'
url: 'https://{{ $node->fqdn }}:{{ $node->daemonListen }}',
target: '_blank'
}, { }, {
type: 'danger', type: 'danger',
delay: 0 delay: 0