diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2011-10-17 18:03:09 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2011-10-17 18:03:09 +0300 |
| commit | b31657ab30488a3d7b439042eca736516dc942a1 (patch) | |
| tree | 80b7ccf11d262942ad76c74db86b156e53bb24fb /server | |
| parent | 29aee598b335bfe17c8ba9c114facb0a7bcdefb3 (diff) | |
modified: server/proxy_ui_server.workspace
modified: server/server/log.cpp
modified: server/server/main.cpp
Diffstat (limited to 'server')
| -rw-r--r-- | server/proxy_ui_server.workspace | 3 | ||||
| -rw-r--r-- | server/server/log.cpp | 2 | ||||
| -rw-r--r-- | server/server/main.cpp | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/server/proxy_ui_server.workspace b/server/proxy_ui_server.workspace index 6c4621d..b3c87b6 100644 --- a/server/proxy_ui_server.workspace +++ b/server/proxy_ui_server.workspace @@ -10,6 +10,7 @@ </WorkspaceConfiguration> </BuildMatrix> <Environment> - <![CDATA[]]> + <![CDATA[ + ]]> </Environment> </CodeLite_Workspace> diff --git a/server/server/log.cpp b/server/server/log.cpp index 41ef828..7cd4ecc 100644 --- a/server/server/log.cpp +++ b/server/server/log.cpp @@ -38,7 +38,7 @@ logtofile::logtofile(const char *pth) } logtofile::logtofile() { - path = strdup("/var/log/aion_otp"); + path = strdup("./server.log"); } logtofile::~logtofile() { diff --git a/server/server/main.cpp b/server/server/main.cpp index 8dcf4e8..262297e 100644 --- a/server/server/main.cpp +++ b/server/server/main.cpp @@ -545,12 +545,10 @@ int main(int argc, char* argv[]) default: break; } +#endif } -#else - cfg_path = "./config"; -#endif #ifndef WIN32 if(daemon) //going to background (only for unix-like systems now) { @@ -574,7 +572,7 @@ int main(int argc, char* argv[]) if (!cfg_path.empty()) cfg = new config(cfg_path.c_str()); else - cfg = new config("/etc/aion_otp"); + cfg = new config("./server.cfg"); logger = new logtofile(cfg->log_path().c_str()); dos_logger = new logtofile(cfg->dos_log_path().c_str()); |