epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6904 from LipkeGu/fix_log_path_prefix

Browse Source 
fix LogPathPrefix
This commit is contained in:
Paul Chote
2014-12-07 10:29:19 +13:00
parent 01b44f0478 0806cca133
commit 400cfb9713
3 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Game/Game.cs
View File

@@ -180,7 +180,6 @@ namespace OpenRA
Settings = new Settings(Platform.ResolvePath("^", "settings.yaml"), args); Settings = new Settings(Platform.ResolvePath("^", "settings.yaml"), args);
Log.LogPath = Platform.ResolvePath("^", "Logs");
Log.AddChannel("perf", "perf.log"); Log.AddChannel("perf", "perf.log");
Log.AddChannel("debug", "debug.log"); Log.AddChannel("debug", "debug.log");
Log.AddChannel("sync", "syncreport.log"); Log.AddChannel("sync", "syncreport.log");

17
OpenRA.Game/Support/Log.cs
View File

@@ -22,24 +22,15 @@ namespace OpenRA
public static class Log public static class Log
{ {
static string LogPathPrefix = ".";
public static readonly Dictionary<string, ChannelInfo> Channels = new Dictionary<string, ChannelInfo>(); public static readonly Dictionary<string, ChannelInfo> Channels = new Dictionary<string, ChannelInfo>();
public static string LogPath
{
get { return LogPathPrefix; }
set
{
LogPathPrefix = value;
Directory.CreateDirectory(LogPathPrefix);
}
}
static IEnumerable<string> FilenamesForChannel(string channelName, string baseFilename) static IEnumerable<string> FilenamesForChannel(string channelName, string baseFilename)
{ {
var path = Platform.SupportDir + "Logs";
Directory.CreateDirectory(path);
for(var i = 0;; i++ ) for(var i = 0;; i++ )
yield return Path.Combine(LogPathPrefix, yield return Path.Combine(path, i > 0 ? "{0}.{1}".F(baseFilename, i) : baseFilename);
i > 0 ? "{0}.{1}".F(baseFilename, i) : baseFilename);
} }
public static void AddChannel(string channelName, string baseFilename) public static void AddChannel(string channelName, string baseFilename)

1
OpenRA.Utility/Program.cs
View File

@@ -28,7 +28,6 @@ namespace OpenRA.Utility
AppDomain.CurrentDomain.AssemblyResolve += GlobalFileSystem.ResolveAssembly; AppDomain.CurrentDomain.AssemblyResolve += GlobalFileSystem.ResolveAssembly;
Log.LogPath = Platform.ResolvePath("^", "Logs");
Log.AddChannel("perf", null); Log.AddChannel("perf", null);
Log.AddChannel("debug", null); Log.AddChannel("debug", null);