pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-30 17:42:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Server Maintenance Script] Improvements to Downloading - Empty File Detection (#2282)

Browse Source 
* Change how the utility script gets downloaded

* Adjust timeouts and order
This commit is contained in:
Chris Miles 2022-07-06 22:13:42 -05:00 committed by GitHub
parent f4904d00d2
commit 19b751257b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
world/main.cpp
View File

@ -65,11 +65,11 @@
#if not defined (FREEBSD) && not defined (DARWIN) #if not defined (FREEBSD) && not defined (DARWIN)
union semun { union semun {
int val; int val;
struct semid_ds *buf; struct semid_ds *buf;
ushort *array; ushort *array;
struct seminfo *__buf; struct seminfo *__buf;
void *__pad; void *__pad;
}; };
#endif #endif
@ -105,6 +105,8 @@ union semun {
#include "world_event_scheduler.h" #include "world_event_scheduler.h"
#include "shared_task_manager.h" #include "shared_task_manager.h"
#include "../common/ip_util.h" #include "../common/ip_util.h"
#include "../common/http/httplib.h"
#include "../common/http/uri.h"
WorldStore world_store; WorldStore world_store;
ClientList client_list; ClientList client_list;
@ -775,23 +777,58 @@ void UpdateWindowTitle(char *iNewTitle)
#endif #endif
} }
int get_file_size(const std::string& filename) // path to file
{
FILE *p_file = NULL;
p_file = fopen(filename.c_str(),"rb");
fseek(p_file,0,SEEK_END);
int size = ftell(p_file);
fclose(p_file);
return size;
}
void CheckForServerScript(bool force_download) void CheckForServerScript(bool force_download)
{ {
const std::string file = "eqemu_server.pl";
std::ifstream f(file);
/* Fetch EQEmu Server script */ /* Fetch EQEmu Server script */
if (!std::ifstream("eqemu_server.pl") || force_download) { if (!f || get_file_size(file) < 100 || force_download) {
if (force_download) { if (force_download) {
std::remove("eqemu_server.pl"); std::remove("eqemu_server.pl");
} /* Delete local before fetch */ } /* Delete local before fetch */
std::cout << "Pulling down EQEmu Server Maintenance Script (eqemu_server.pl)..." << std::endl; std::cout << "Pulling down EQEmu Server Maintenance Script (eqemu_server.pl)..." << std::endl;
// http get request
uri u("https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl");
httplib::Client r(
fmt::format(
"{}://{}",
u.get_scheme(),
u.get_host()
).c_str()
);
r.set_connection_timeout(1, 0);
r.set_read_timeout(1, 0);
r.set_write_timeout(1, 0);
if (auto res = r.Get(u.get_path().c_str())) {
if (res->status == 200) {
// write file
std::ofstream out("eqemu_server.pl");
out << res->body;
out.close();
#ifdef _WIN32 #ifdef _WIN32
if(system("perl -MLWP::UserAgent -e \"require LWP::UserAgent; my $ua = LWP::UserAgent->new; $ua->timeout(10); $ua->env_proxy; my $response = $ua->get('https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl'); if ($response->is_success){ open(FILE, '> eqemu_server.pl'); print FILE $response->decoded_content; close(FILE); }\""));
#else #else
if (system( system("chmod 755 eqemu_server.pl");
"wget -N --no-check-certificate --quiet -O eqemu_server.pl https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl" system("chmod +x eqemu_server.pl");
)) {}
#endif #endif
}
}
} }
} }