From 1734a03d41bb0c2fc03633bdb3c3b696a5b314cf Mon Sep 17 00:00:00 2001 From: Aigio Liu Date: Mon, 19 Aug 2024 16:03:00 +0800 Subject: [PATCH] IPCSubProcessFileSystem.GetLogDirPath --- .../Services/IPCSubProcessService.cs | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/src/BD.WTTS.Client.IPC/Services/IPCSubProcessService.cs b/src/BD.WTTS.Client.IPC/Services/IPCSubProcessService.cs index cdf3a9724..9b8c1e57b 100644 --- a/src/BD.WTTS.Client.IPC/Services/IPCSubProcessService.cs +++ b/src/BD.WTTS.Client.IPC/Services/IPCSubProcessService.cs @@ -311,10 +311,29 @@ sealed class IPCSubProcessFileSystem : IOPath.FileSystemBase config.LoggingRules.Add(new LoggingRule("*", minLevel, target)); } + public static string GetLogDirPath(string? moduleName = null, string? cacheDirectory = null) + { + cacheDirectory ??= IOPath.CacheDirectory; + + string logDirPath; + if (moduleName == null) + { + logDirPath = Path.Combine(cacheDirectory, LogDirName); + } + else + { + var dirName = GetDirectoryName(moduleName); + logDirPath = Path.Combine(cacheDirectory, LogDirName, dirName); + } + + IOPath.DirCreateByNotExists(logDirPath); + return logDirPath; + } + [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void InitLog( ref string? logDirPath, - string? mainProcessModuleName = null, + string? moduleName = null, string? alias = null, string? cacheDirectory = null #if STARTUP_WATCH_TRACE || DEBUG @@ -335,16 +354,8 @@ sealed class IPCSubProcessFileSystem : IOPath.FileSystemBase cacheDirectory ??= IOPath.CacheDirectory; - if (mainProcessModuleName == null) - { - logDirPath = Path.Combine(cacheDirectory, LogDirName); - } - else - { - var dirName = GetDirectoryName(mainProcessModuleName); - logDirPath = Path.Combine(cacheDirectory, LogDirName, dirName); - } - IOPath.DirCreateByNotExists(logDirPath); + logDirPath = GetLogDirPath(moduleName, cacheDirectory); + #if (STARTUP_WATCH_TRACE || DEBUG) && !LIB_CLIENT_IPC if (watchTrace) Startup.WatchTrace.Record("InitLog.IOPath"); #endif