cmhi
/
NetTunnelWindows
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCT 1. 修复日志文件配置为相对路径时无法正常创建日志文件问题

This commit is contained in:
黄昕 2023-08-24 09:47:01 +08:00
parent c2153fd024
commit d6e1ee67d0
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
NetTunnelSDK/tunnel/tunnel.cpp
View File

@ -50,17 +50,22 @@ static spdlog::level::level_enum logLevelToSpdlogLevel(LOG_LEVEL level) {
static void InitTunnelSDKLog(const TCHAR *pLogFile, LOG_LEVEL level) { static void InitTunnelSDKLog(const TCHAR *pLogFile, LOG_LEVEL level) {
TCHAR buf[MAX_PATH] = {0}; TCHAR buf[MAX_PATH] = {0};
if (pLogFile && strlen(pLogFile) > 0 && !PathIsRelative(pLogFile)) {
TCHAR tmpPath[MAX_PATH]; TCHAR tmpPath[MAX_PATH];
StringCbCopy(tmpPath, MAX_PATH, pLogFile);
PathRemoveFileSpec(tmpPath); if (pLogFile && strlen(pLogFile) > 0) {
MakeSureDirectoryPathExists(tmpPath); if (PathIsRelative(buf)) {
StringCbPrintf(buf, MAX_PATH, TEXT("%s\\%s"), g_globalConfig.workDirectory, pLogFile);
} else {
StringCbCopy(buf, MAX_PATH, pLogFile); StringCbCopy(buf, MAX_PATH, pLogFile);
}
} else { } else {
StringCbPrintf(buf, MAX_PATH, TEXT("%s\\tunnelsdklog.log"), g_globalConfig.workDirectory); StringCbPrintf(buf, MAX_PATH, TEXT("%s\\tunnelsdklog.log"), g_globalConfig.workDirectory);
} }
StringCbCopy(tmpPath, MAX_PATH, buf);
PathRemoveFileSpec(tmpPath);
MakeSureDirectoryPathExists(tmpPath);
g_globalConfig.enableLog = TRUE; g_globalConfig.enableLog = TRUE;
g_globalConfig.logLevel = logLevelToSpdlogLevel(level); g_globalConfig.logLevel = logLevelToSpdlogLevel(level);

3
TestNetTunnelSDK/TestNetTunnelSDK.cpp
View File

@ -19,8 +19,7 @@ TEST_MODULE_INITIALIZE(ModuleInitialize) {
Assert::AreEqual(0, Assert::AreEqual(0,
TunnelSDKInitEnv(path, TunnelSDKInitEnv(path,
"http://172.21.40.194:32549", "http://172.21.40.194:32549",
TEXT("C:\\Users\\HuangXin\\Documents\\development\\visual_studio\\tunnel_" TEXT("./test/utest.log"),
"windows\\NetTunnelApp\\bin\\Debug\\utest.log"),
LOG_TRACE, LOG_TRACE,
false)); false));
//Assert::AreEqual(0, EnableVerifySignature(TEXT("123"), TEXT("123456"))); //Assert::AreEqual(0, EnableVerifySignature(TEXT("123"), TEXT("123456")));