Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-09 06:13:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(dashboard): MySQL backups with a tcp://, unix:// or pipe:// mysql_host

Browse Source 
mysqldump was given --host=tcp --port=//host:port for the tcp:// form the servers accept, so
backups failed. Read mysql_host the way the servers connect with it: tcp://host:port (a trailing
/database is dropped), unix:// as --socket and pipe:// as a named pipe.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-26 18:45:39 -05:00
parent d422a25a01
commit 98fd72cf75
3 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dDashboardServer/routes/BackupFiles.cpp
View File

@@ -116,16 +116,33 @@ namespace BackupFiles {
}
std::vector<std::string> MysqldumpArguments(const DumpCommand& command) {
// mysql_host as the servers read it (MySQLDatabase::Connect): host, host:port, tcp://host:port, unix://socket or pipe://name
auto host = command.host;
std::string port;
if (const auto colon = host.find(':'); colon != std::string::npos) {
port = host.substr(colon + 1);
host = host.substr(0, colon);
std::string socket;
bool pipe = false;
if (host.starts_with("unix://")) {
socket = host.substr(7);
host.clear();
} else if (host.starts_with("pipe://")) {
socket = host.substr(7);
pipe = true;
host.clear();
} else {
if (host.starts_with("tcp://")) host = host.substr(6);
// A database after the address (tcp://host:port/db) is not the host's; mysql_database names it
if (const auto slash = host.find('/'); slash != std::string::npos) host.resize(slash);
if (const auto colon = host.find(':'); colon != std::string::npos) {
port = host.substr(colon + 1);
host = host.substr(0, colon);
}
}
std::vector<std::string> arguments{ command.program, "--defaults-extra-file=" + command.optionsFile,
"--single-transaction", "--quick", "--routines", "--triggers", "--hex-blob", "--no-tablespaces", "--default-character-set=utf8mb4" };
if (!host.empty()) arguments.push_back("--host=" + host);
if (!port.empty()) arguments.push_back("--port=" + port);
if (pipe) arguments.push_back("--protocol=PIPE");
if (!socket.empty()) arguments.push_back("--socket=" + socket);
arguments.push_back("--result-file=" + command.target);
if (!command.errorFile.empty()) arguments.push_back("--log-error=" + command.errorFile);
arguments.push_back(command.database);