diff --git a/build/.idea/build.iml b/build/.idea/build.iml index 8a947047..9081e23c 100644 --- a/build/.idea/build.iml +++ b/build/.idea/build.iml @@ -2,7 +2,7 @@ - + diff --git a/build/builder/build-pysrt.py b/build/builder/build-pysrt.py index 2844b022..6ac7df05 100644 --- a/build/builder/build-pysrt.py +++ b/build/builder/build-pysrt.py @@ -180,7 +180,7 @@ def _make_py_ver_file(self): def _get_py_dll_name(self): #return 'python{}{}.dll'.format(PY_VER[0], PY_VER[1]) - return 'python{}.dll'.format(utils.cfg.py_ver_str) + return 'python{}.dll'.format(env.py_ver_str) class PYSBaseLinux(PYSBase): diff --git a/server/share/etc/core.ini.in b/server/share/etc/core.ini.in index fd451c5e..53112879 100644 --- a/server/share/etc/core.ini.in +++ b/server/share/etc/core.ini.in @@ -11,7 +11,7 @@ # LOG_LEVEL_INFO 2 log infomation/warning/error message. # LOG_LEVEL_WARN 3 log warning and error message. # LOG_LEVEL_ERROR 4 log error message only. -log-level=0 +log-level=2 ; 'replay-path' define the replay file location. if not set, default location ; to $INSTDIR%/data/replay/ @@ -20,9 +20,8 @@ log-level=0 web-server-rpc=http://127.0.0.1:7190/rpc [rpc] -; Request by web server. `bind-ip` should be the ip of core server. If -; web server and core server running at the same machine, it should be -; 127.0.0.1 +; Request by web server. `bind-ip` should be the ip of core server. If web server and +; core server running at the same machine, it should be 127.0.0.1. bind-ip=127.0.0.1 bind-port=52080 diff --git a/server/share/etc/web.ini.in b/server/share/etc/web.ini.in index a44969fd..a39538d2 100644 --- a/server/share/etc/web.ini.in +++ b/server/share/etc/web.ini.in @@ -14,7 +14,7 @@ port=7190 # LOG_LEVEL_INFO 2 log infomation/warning/error message. # LOG_LEVEL_WARN 3 log warning and error message. # LOG_LEVEL_ERROR 4 log error message only. -log-level=1 +log-level=2 ; running in debug mode. default to 0. ; in debug mode, log-level set to 0 and trace call stack while exception raise. diff --git a/server/tp_core/core/ts_env.cpp b/server/tp_core/core/ts_env.cpp index e9928b89..78b79b9f 100644 --- a/server/tp_core/core/ts_env.cpp +++ b/server/tp_core/core/ts_env.cpp @@ -49,7 +49,7 @@ bool TsEnv::init(bool load_config) } else // not in development mode { -#ifdef EX_OS_WIN +#ifdef EX_OS_WIN32 base_path = m_exec_path; ex_path_join(base_path, true, L"..", NULL); m_etc_path = base_path; @@ -70,7 +70,7 @@ bool TsEnv::init(bool load_config) if (!m_ini.LoadFromFile(conf_file)) { - EXLOGE("[core] can not load core.ini.\n"); + EXLOGE(L"[core] can not load %ls.\n", conf_file.c_str()); return false; }