From 349d67974255361669b3a8719af4e040f16a8cab Mon Sep 17 00:00:00 2001 From: apexliu Date: Tue, 28 Mar 2017 01:55:29 +0800 Subject: [PATCH] =?UTF-8?q?fixme:=20win=E5=85=A8=E6=96=B0=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E5=B9=B6=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=90=8E=EF=BC=8C=E5=BF=85=E9=A1=BB=E9=87=8D=E5=90=AF?= =?UTF-8?q?web=E6=9C=8D=E5=8A=A1=EF=BC=8C=E5=90=A6=E5=88=99=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=AE=BF=E9=97=AE=E6=80=BB=E6=98=AF=E4=BC=9A?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/.idea/build.iml | 2 +- build/builder/build-pysrt.py | 2 +- server/share/etc/core.ini.in | 7 +++---- server/share/etc/web.ini.in | 2 +- server/tp_core/core/ts_env.cpp | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/build/.idea/build.iml b/build/.idea/build.iml index 8a94704..9081e23 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 2844b02..6ac7df0 100644 --- a/build/builder/build-pysrt.py +++ b/build/builder/build-pysrt.py @@ -180,7 +180,7 @@ class PYSBaseWin(PYSBase): 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 fd451c5..5311287 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 a44969f..a39538d 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 e9928b8..78b79b9 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; }