github
/
teleport
mirror of https://github.com/tp4a/teleport
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixme: win全新安装并初始化数据库后，必须重启web服务，否则数据库访问总是会失败。

pull/32/merge
apexliu 2017-03-28 01:55:29 +08:00
parent c473b1973b
commit 349d679742
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/.idea/build.iml
View File

@ -2,7 +2,7 @@
<module type="PYTHON_MODULE" version="4"> <module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$/builder" /> <content url="file://$MODULE_DIR$/builder" />
<orderEntry type="jdk" jdkName="py34" jdkType="Python SDK" /> <orderEntry type="jdk" jdkName="py" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
<component name="TestRunnerService"> <component name="TestRunnerService">

2
build/builder/build-pysrt.py
View File

@ -180,7 +180,7 @@ class PYSBaseWin(PYSBase):
def _get_py_dll_name(self): def _get_py_dll_name(self):
#return 'python{}{}.dll'.format(PY_VER[0], PY_VER[1]) #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): class PYSBaseLinux(PYSBase):

7
server/share/etc/core.ini.in
View File

@ -11,7 +11,7 @@
# LOG_LEVEL_INFO 2 log infomation/warning/error message. # LOG_LEVEL_INFO 2 log infomation/warning/error message.
# LOG_LEVEL_WARN 3 log warning and error message. # LOG_LEVEL_WARN 3 log warning and error message.
# LOG_LEVEL_ERROR 4 log error message only. # 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 ; 'replay-path' define the replay file location. if not set, default location
; to $INSTDIR%/data/replay/ ; to $INSTDIR%/data/replay/
@ -20,9 +20,8 @@ log-level=0
web-server-rpc=http://127.0.0.1:7190/rpc web-server-rpc=http://127.0.0.1:7190/rpc
[rpc] [rpc]
; Request by web server. `bind-ip` should be the ip of core server. If ; Request by web server. `bind-ip` should be the ip of core server. If web server and
; web server and core server running at the same machine, it should be ; core server running at the same machine, it should be 127.0.0.1.
; 127.0.0.1
bind-ip=127.0.0.1 bind-ip=127.0.0.1
bind-port=52080 bind-port=52080

2
server/share/etc/web.ini.in
View File

@ -14,7 +14,7 @@ port=7190
# LOG_LEVEL_INFO 2 log infomation/warning/error message. # LOG_LEVEL_INFO 2 log infomation/warning/error message.
# LOG_LEVEL_WARN 3 log warning and error message. # LOG_LEVEL_WARN 3 log warning and error message.
# LOG_LEVEL_ERROR 4 log error message only. # LOG_LEVEL_ERROR 4 log error message only.
log-level=1 log-level=2
; running in debug mode. default to 0. ; running in debug mode. default to 0.
; in debug mode, log-level set to 0 and trace call stack while exception raise. ; in debug mode, log-level set to 0 and trace call stack while exception raise.

4
server/tp_core/core/ts_env.cpp
View File

@ -49,7 +49,7 @@ bool TsEnv::init(bool load_config)
} }
else // not in development mode else // not in development mode
{ {
#ifdef EX_OS_WIN #ifdef EX_OS_WIN32
base_path = m_exec_path; base_path = m_exec_path;
ex_path_join(base_path, true, L"..", NULL); ex_path_join(base_path, true, L"..", NULL);
m_etc_path = base_path; m_etc_path = base_path;
@ -70,7 +70,7 @@ bool TsEnv::init(bool load_config)
if (!m_ini.LoadFromFile(conf_file)) 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; return false;
} }