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

Fix exit code values

Browse Source 
- Change all exit codes to match the standard of 0 for success
and 1 for error

- Add empty shared folder to utils/defaults for shared_memory
This commit is contained in:
j883376 2013-06-21 22:54:28 -04:00
parent 76e25f75fa
commit 2a39449f6e
7 changed files with 60 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eqlaunch/eqlaunch.cpp
View File

@ -44,13 +44,13 @@ int main(int argc, char *argv[]) {
}
if(launcher_name.length() < 1) {
_log(LAUNCHER__ERROR, "You must specfify a launcher name as the first argument to this program.");
return(1);
return 1;
}
_log(LAUNCHER__INIT, "Loading server configuration..");
if (!EQEmuConfig::LoadConfig()) {
_log(LAUNCHER__ERROR, "Loading server configuration failed.");
return(1);
return 1;
}
const EQEmuConfig *Config = EQEmuConfig::get();
@ -173,7 +173,7 @@ int main(int argc, char *argv[]) {
delete zone->second;
}
return(0);
return 0;
}

8
queryserv/queryserv.cpp
View File

@ -69,7 +69,7 @@ int main() {
_log(QUERYSERV__INIT, "Loading server configuration failed.");
return(1);
return 1;
}
Config = queryservconfig::get();
@ -90,16 +90,16 @@ int main() {
Config->QSDatabaseDB.c_str(),
Config->QSDatabasePort)) {
_log(WORLD__INIT_ERR, "Cannot continue without a database connection.");
return(1);
return 1;
}
if (signal(SIGINT, CatchSignal) == SIG_ERR) {
_log(QUERYSERV__ERROR, "Could not set signal handler");
return 0;
return 1;
}
if (signal(SIGTERM, CatchSignal) == SIG_ERR) {
_log(QUERYSERV__ERROR, "Could not set signal handler");
return 0;
return 1;
}
worldserver = new WorldServer;

14
shared_memory/main.cpp
View File

@ -37,7 +37,7 @@ int main(int argc, char **argv) {
LogFile->write(EQEMuLog::Status, "Shared Memory Loader Program");
if(!EQEmuConfig::LoadConfig()) {
LogFile->write(EQEMuLog::Error, "Unable to load configuration file.");
return 0;
return 1;
}
const EQEmuConfig *config = EQEmuConfig::get();
@ -51,7 +51,7 @@ int main(int argc, char **argv) {
config->DatabasePassword.c_str(), config->DatabaseDB.c_str(), config->DatabasePort)) {
LogFile->write(EQEMuLog::Error, "Unable to connect to the database, cannot continue without a "
"database connection");
return 0;
return 1;
}
bool load_all = true;
@ -111,7 +111,7 @@ int main(int argc, char **argv) {
LoadItems(&database);
} catch(std::exception &ex) {
LogFile->write(EQEMuLog::Error, "%s", ex.what());
return 0;
return 1;
}
}
@ -121,7 +121,7 @@ int main(int argc, char **argv) {
LoadFactions(&database);
} catch(std::exception &ex) {
LogFile->write(EQEMuLog::Error, "%s", ex.what());
return 0;
return 1;
}
}
@ -131,7 +131,7 @@ int main(int argc, char **argv) {
LoadLoot(&database);
} catch(std::exception &ex) {
LogFile->write(EQEMuLog::Error, "%s", ex.what());
return 0;
return 1;
}
}
@ -141,7 +141,7 @@ int main(int argc, char **argv) {
LoadSkillCaps(&database);
} catch(std::exception &ex) {
LogFile->write(EQEMuLog::Error, "%s", ex.what());
return 0;
return 1;
}
}
@ -151,7 +151,7 @@ int main(int argc, char **argv) {
LoadSpells(&database);
} catch(std::exception &ex) {
LogFile->write(EQEMuLog::Error, "%s", ex.what());
return 0;
return 1;
}
}

8
ucs/ucs.cpp
View File

@ -82,7 +82,7 @@ int main() {
_log(UCS__INIT, "Loading server configuration failed.");
return(1);
return 1;
}
Config = ucsconfig::get();
@ -103,7 +103,7 @@ int main() {
Config->DatabaseDB.c_str(),
Config->DatabasePort)) {
_log(WORLD__INIT_ERR, "Cannot continue without a database connection.");
return(1);
return 1;
}
char tmp[64];
@ -137,11 +137,11 @@ int main() {
if (signal(SIGINT, CatchSignal) == SIG_ERR) {
_log(UCS__ERROR, "Could not set signal handler");
return 0;
return 1;
}
if (signal(SIGTERM, CatchSignal) == SIG_ERR) {
_log(UCS__ERROR, "Could not set signal handler");
return 0;
return 1;
}
worldserver = new WorldServer;

0
utils/defaults/shared/.keep Normal file
View File

57
world/net.cpp
View File

@ -126,7 +126,7 @@ int main(int argc, char** argv) {
_log(WORLD__INIT, "Loading server configuration..");
if (!WorldConfig::LoadConfig()) {
_log(WORLD__INIT_ERR, "Loading server configuration failed.");
return(1);
return 1;
}
const WorldConfig *Config=WorldConfig::get();
@ -144,16 +144,16 @@ int main(int argc, char** argv) {
if (signal(SIGINT, CatchSignal) == SIG_ERR) {
_log(WORLD__INIT_ERR, "Could not set signal handler");
return 0;
return 1;
}
if (signal(SIGTERM, CatchSignal) == SIG_ERR) {
_log(WORLD__INIT_ERR, "Could not set signal handler");
return 0;
return 1;
}
#ifndef WIN32
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
_log(WORLD__INIT_ERR, "Could not set signal handler");
return 0;
return 1;
}
#endif
@ -182,7 +182,7 @@ int main(int argc, char** argv) {
Config->DatabaseDB.c_str(),
Config->DatabasePort)) {
_log(WORLD__INIT_ERR, "Cannot continue without a database connection.");
return(1);
return 1;
}
dbasync = new DBAsync(&database);
guild_mgr.SetDatabase(&database);
@ -204,8 +204,8 @@ int main(int argc, char** argv) {
else if (database.GetVariable("disablecommandline", tmp, 2)) {
if (strlen(tmp) == 1) {
if (tmp[0] == '1') {
std::cout << "Command line disabled in database... exiting" << std::endl;
return 0;
std::cerr << "Command line disabled in database... exiting" << std::endl;
return 1;
}
}
}
@ -213,11 +213,14 @@ int main(int argc, char** argv) {
if (argc == 5) {
if (Seperator::IsNumber(argv[4])) {
if (atoi(argv[4]) >= 0 && atoi(argv[4]) <= 255) {
if (database.CreateAccount(argv[2], argv[3], atoi(argv[4])) == 0)
std::cout << "database.CreateAccount failed." << std::endl;
else
if (database.CreateAccount(argv[2], argv[3], atoi(argv[4])) == 0) {
std::cerr << "database.CreateAccount failed." << std::endl;
return 1;
}
else {
std::cout << "Account created: Username='" << argv[2] << "', Password='" << argv[3] << "', status=" << argv[4] << std::endl;
return 0;
return 0;
}
}
}
}
@ -230,11 +233,14 @@ int main(int argc, char** argv) {
if (Seperator::IsNumber(argv[3])) {
if (atoi(argv[3]) >= 0 && atoi(argv[3]) <= 255) {
if (database.SetAccountStatus(argv[2], atoi(argv[3])))
if (database.SetAccountStatus(argv[2], atoi(argv[3]))) {
std::cout << "Account flagged: Username='" << argv[2] << "', status=" << argv[3] << std::endl;
else
std::cout << "database.SetAccountStatus failed." << std::endl;
return 0;
return 0;
}
else {
std::cerr << "database.SetAccountStatus failed." << std::endl;
return 1;
}
}
}
}
@ -245,25 +251,30 @@ int main(int argc, char** argv) {
else if (strcasecmp(argv[1], "startzone") == 0) {
if (argc == 3) {
if (strlen(argv[2]) < 3) {
std::cout << "Error: zone name too short" << std::endl;
std::cerr << "Error: zone name too short" << std::endl;
return 1;
}
else if (strlen(argv[2]) > 15) {
std::cout << "Error: zone name too long" << std::endl;
std::cerr << "Error: zone name too long" << std::endl;
return 1;
}
else {
if (database.SetVariable("startzone", argv[2]))
if (database.SetVariable("startzone", argv[2])) {
std::cout << "Starting zone changed: '" << argv[2] << "'" << std::endl;
else
std::cout << "database.SetVariable failed." << std::endl;
return 0;
}
else {
std::cerr << "database.SetVariable failed." << std::endl;
return 1;
}
}
return 0;
}
std::cout << "Usage: world startzone zoneshortname" << std::endl;
return 0;
}
else {
std::cout << "Error, unknown command line option" << std::endl;
return 0;
std::cerr << "Error, unknown command line option" << std::endl;
return 1;
}
}

16
zone/net.cpp
View File

@ -144,7 +144,7 @@ int main(int argc, char** argv) {
_log(ZONE__INIT, "Loading server configuration..");
if (!ZoneConfig::LoadConfig()) {
_log(ZONE__INIT_ERR, "Loading server configuration failed.");
return(1);
return 1;
}
const ZoneConfig *Config=ZoneConfig::get();
@ -163,7 +163,7 @@ int main(int argc, char** argv) {
Config->DatabaseDB.c_str(),
Config->DatabasePort)) {
_log(ZONE__INIT_ERR, "Cannot continue without a database connection.");
return(1);
return 1;
}
dbasync = new DBAsync(&database);
dbasync->AddFQ(&MTdbafq);
@ -182,16 +182,16 @@ int main(int argc, char** argv) {
*/
if (signal(SIGINT, CatchSignal) == SIG_ERR) {
_log(ZONE__INIT_ERR, "Could not set signal handler");
return 0;
return 1;
}
if (signal(SIGTERM, CatchSignal) == SIG_ERR) {
_log(ZONE__INIT_ERR, "Could not set signal handler");
return 0;
return 1;
}
#ifndef WIN32
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
_log(ZONE__INIT_ERR, "Could not set signal handler");
return 0;
return 1;
}
#endif
@ -217,19 +217,19 @@ int main(int argc, char** argv) {
if (!database.LoadNPCFactionLists()) {
_log(ZONE__INIT_ERR, "Loading npcs faction lists FAILED!");
CheckEQEMuErrorAndPause();
return 0;
return 1;
}
_log(ZONE__INIT, "Loading loot tables");
if (!database.LoadLoot()) {
_log(ZONE__INIT_ERR, "Loading loot FAILED!");
CheckEQEMuErrorAndPause();
return 0;
return 1;
}
_log(ZONE__INIT, "Loading skill caps");
if (!database.LoadSkillCaps()) {
_log(ZONE__INIT_ERR, "Loading skill caps FAILED!");
CheckEQEMuErrorAndPause();
return 0;
return 1;
}
_log(ZONE__INIT, "Loading spells");