Revert "Merge pull request #77 from j883376/cleanups"

This reverts commit 4ff2efea43, reversing
changes made to e811e3975b.
This commit is contained in:
KimLS
2013-06-27 12:50:20 -07:00
parent 82f4b4ee53
commit d25205d9d3
29 changed files with 181 additions and 151 deletions
+1 -1
View File
@@ -43,4 +43,4 @@ IF(UNIX)
ADD_DEFINITIONS(-fPIC)
ENDIF(UNIX)
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/Bin)
SET(EXECUTABLE_OUTPUT_PATH ../Bin)
+4 -4
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 1;
return 0;
}
if (signal(SIGTERM, CatchSignal) == SIG_ERR) {
_log(QUERYSERV__ERROR, "Could not set signal handler");
return 1;
return 0;
}
worldserver = new WorldServer;