-
Notifications
You must be signed in to change notification settings - Fork 173
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: split out system() calls from the rest of MasterServer (#1368)
- Loading branch information
Showing
5 changed files
with
83 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
#include "Start.h" | ||
#include "Logger.h" | ||
#include "dConfig.h" | ||
#include "Game.h" | ||
#include "BinaryPathFinder.h" | ||
|
||
void StartChatServer() { | ||
if (Game::shouldShutdown) { | ||
LOG("Currently shutting down. Chat will not be restarted."); | ||
return; | ||
} | ||
#ifdef __APPLE__ | ||
//macOS doesn't need sudo to run on ports < 1024 | ||
auto result = system(((BinaryPathFinder::GetBinaryDir() / "ChatServer").string() + "&").c_str()); | ||
#elif _WIN32 | ||
auto result = system(("start " + (BinaryPathFinder::GetBinaryDir() / "ChatServer.exe").string()).c_str()); | ||
#else | ||
if (std::atoi(Game::config->GetValue("use_sudo_chat").c_str())) { | ||
auto result = system(("sudo " + (BinaryPathFinder::GetBinaryDir() / "ChatServer").string() + "&").c_str()); | ||
} else { | ||
auto result = system(((BinaryPathFinder::GetBinaryDir() / "ChatServer").string() + "&").c_str()); | ||
} | ||
#endif | ||
} | ||
|
||
void StartAuthServer() { | ||
if (Game::shouldShutdown) { | ||
LOG("Currently shutting down. Auth will not be restarted."); | ||
return; | ||
} | ||
#ifdef __APPLE__ | ||
auto result = system(((BinaryPathFinder::GetBinaryDir() / "AuthServer").string() + "&").c_str()); | ||
#elif _WIN32 | ||
auto result = system(("start " + (BinaryPathFinder::GetBinaryDir() / "AuthServer.exe").string()).c_str()); | ||
#else | ||
if (std::atoi(Game::config->GetValue("use_sudo_auth").c_str())) { | ||
auto result = system(("sudo " + (BinaryPathFinder::GetBinaryDir() / "AuthServer").string() + "&").c_str()); | ||
} else { | ||
auto result = system(((BinaryPathFinder::GetBinaryDir() / "AuthServer").string() + "&").c_str()); | ||
} | ||
#endif | ||
} | ||
|
||
void StartWorldServer(LWOMAPID mapID, uint16_t port, LWOINSTANCEID lastInstanceID, int maxPlayers, LWOCLONEID cloneID) { | ||
#ifdef _WIN32 | ||
std::string cmd = "start " + (BinaryPathFinder::GetBinaryDir() / "WorldServer.exe").string() + " -zone "; | ||
#else | ||
std::string cmd; | ||
if (std::atoi(Game::config->GetValue("use_sudo_world").c_str())) { | ||
cmd = "sudo " + (BinaryPathFinder::GetBinaryDir() / "WorldServer").string() + " -zone "; | ||
} else { | ||
cmd = (BinaryPathFinder::GetBinaryDir() / "WorldServer").string() + " -zone "; | ||
} | ||
#endif | ||
|
||
cmd.append(std::to_string(mapID)); | ||
cmd.append(" -port "); | ||
cmd.append(std::to_string(port)); | ||
cmd.append(" -instance "); | ||
cmd.append(std::to_string(lastInstanceID)); | ||
cmd.append(" -maxclients "); | ||
cmd.append(std::to_string(maxPlayers)); | ||
cmd.append(" -clone "); | ||
cmd.append(std::to_string(cloneID)); | ||
|
||
#ifndef _WIN32 | ||
cmd.append("&"); //Sends our next process to the background on Linux | ||
#endif | ||
|
||
auto ret = system(cmd.c_str()); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
#pragma once | ||
#include "dCommonVars.h" | ||
|
||
void StartAuthServer(); | ||
void StartChatServer(); | ||
void StartWorldServer(LWOMAPID mapID, uint16_t port, LWOINSTANCEID lastInstanceID, int maxPlayers, LWOCLONEID cloneID); |