pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-15 08:21:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update eqemu_server.pl to use wget for windows for more reliable web requests that don't hang infinitely [skip ci]

Browse Source
This commit is contained in:
Akkadius 2017-05-04 01:57:27 -05:00
parent 8435fa269d
commit c1ee88a90e
1 changed files with 16 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
utils/scripts/eqemu_server.pl
View File

@ -49,6 +49,7 @@ if(-e "eqemu_server_skip_update.txt"){
#::: Check for script self update #::: Check for script self update
do_self_update_check_routine() if !$skip_self_update_check; do_self_update_check_routine() if !$skip_self_update_check;
get_windows_wget();
get_perl_version(); get_perl_version();
read_eqemu_config_xml(); read_eqemu_config_xml();
get_mysql_path(); get_mysql_path();
@ -517,6 +518,13 @@ sub get_perl_version {
no warnings; no warnings;
} }
sub get_windows_wget {
if(!-e "wget.exe" && $OS eq "Windows"){
eval "use LWP::Simple qw(getstore);";
getstore("https://raw.githubusercontent.com/Akkadius/EQEmuInstall/master/wget.exe", "wget.exe");
}
}
sub do_self_update_check_routine { sub do_self_update_check_routine {
#::: Check for internet connection before updating #::: Check for internet connection before updating
@ -524,7 +532,7 @@ sub do_self_update_check_routine {
print "[Update] Cannot check update without internet connection...\n"; print "[Update] Cannot check update without internet connection...\n";
return; return;
} }
#::: Check for script changes :: eqemu_server.pl #::: Check for script changes :: eqemu_server.pl
get_remote_file($eqemu_repository_request_url . "utils/scripts/eqemu_server.pl", "updates_staged/eqemu_server.pl", 0, 1, 1); get_remote_file($eqemu_repository_request_url . "utils/scripts/eqemu_server.pl", "updates_staged/eqemu_server.pl", 0, 1, 1);
@ -997,68 +1005,14 @@ sub get_remote_file{
} }
} }
if($OS eq "Windows"){ #::: wget -O db_update/db_update_manifest.txt https://raw.githubusercontent.com/EQEmu/Server/master/utils/sql/db_update_manifest.txt
#::: For non-text type requests... $wget = `wget -N --no-check-certificate --quiet -O $destination_file $request_url`;
if($content_type == 1){ print "[Download] Saved: (" . $destination_file . ") from " . $request_url . "\n" if !$silent_download;
$break = 0; if($wget=~/unable to resolve/i){
while($break == 0) { print "Error, no connection or failed request...\n\n";
eval "use LWP::Simple qw(getstore);"; #die;
# use LWP::Simple qw(getstore);
# print "request is " . $request_url . "\n";
# print "destination file is supposed to be " . $destination_file . "\n";
if(!getstore($request_url, $destination_file)){
print "[Download] Error, no connection or failed request...\n\n";
}
# sleep(1);
#::: Make sure the file exists before continuing...
if(-e $destination_file) {
$break = 1;
print "[Download] Saved: (" . $destination_file . ") from " . $request_url . "\n" if !$silent_download;
} else { $break = 0; }
usleep(500);
if($no_retry){
$break = 1;
}
}
}
else{
$break = 0;
while($break == 0) {
require LWP::UserAgent;
my $ua = LWP::UserAgent->new;
$ua->timeout(10);
$ua->env_proxy;
my $response = $ua->get($request_url);
if ($response->is_success){
open (FILE, '> ' . $destination_file . '');
print FILE $response->decoded_content;
close (FILE);
}
else {
print "[Download] Error, no connection or failed request...\n\n";
}
if(-e $destination_file) {
$break = 1;
print "[Download] Saved: (" . $destination_file . ") from " . $request_url . "\n" if !$silent_download;
} else { $break = 0; }
usleep(500);
if($no_retry){
$break = 1;
}
}
}
}
if($OS eq "Linux"){
#::: wget -O db_update/db_update_manifest.txt https://raw.githubusercontent.com/EQEmu/Server/master/utils/sql/db_update_manifest.txt
$wget = `wget --no-check-certificate --quiet -O $destination_file $request_url`;
print "[Download] Saved: (" . $destination_file . ") from " . $request_url . "\n" if !$silent_download;
if($wget=~/unable to resolve/i){
print "Error, no connection or failed request...\n\n";
#die;
}
} }
} }
#::: Trim Whitespaces #::: Trim Whitespaces