diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt index c0d6611..9463411 100644 --- a/Builder/IISMainHandler/build.txt +++ b/Builder/IISMainHandler/build.txt @@ -1 +1 @@ -1996 \ No newline at end of file +2000 \ No newline at end of file diff --git a/FLocal.Patcher.Common/PatcherConfiguration.cs b/FLocal.Patcher.Common/PatcherConfiguration.cs index b35d07c..a7d06ae 100644 --- a/FLocal.Patcher.Common/PatcherConfiguration.cs +++ b/FLocal.Patcher.Common/PatcherConfiguration.cs @@ -39,6 +39,13 @@ namespace FLocal.Patcher.Common { } } + private readonly string _LogDir; + public string LogDir { + get { + return this._LogDir; + } + } + public IEnumerable getPatchesList() { return PatchesLoader.getPatchesList(); } @@ -52,6 +59,7 @@ namespace FLocal.Patcher.Common { this._EnvironmentName = data["Patcher.EnvironmentName"].ToString(); this._GuestConnectionString = data["ConnectionString"].ToString(); this._PatchesTable = data["Patcher.PatchesTable"].ToString(); + this._LogDir = Path.Combine(data["DataDir"], "Logs"); } public static void Init(NameValueCollection data) { diff --git a/Patcher.Web/CheckParams.cs b/Patcher.Web/CheckParams.cs index 2fa0ba7..1db7923 100644 --- a/Patcher.Web/CheckParams.cs +++ b/Patcher.Web/CheckParams.cs @@ -35,5 +35,11 @@ namespace Patcher.Web { return this.configuration.getPatchesList(); } + public string LogDir { + get { + return this.configuration.LogDir; + } + } + } } diff --git a/Patcher.Web/IPatcherConfiguration.cs b/Patcher.Web/IPatcherConfiguration.cs index fe29759..09898d6 100644 --- a/Patcher.Web/IPatcherConfiguration.cs +++ b/Patcher.Web/IPatcherConfiguration.cs @@ -28,5 +28,9 @@ namespace Patcher.Web { Stream loadPatch(PatchId patchId); + string LogDir { + get; + } + } } diff --git a/Patcher/Checker.cs b/Patcher/Checker.cs index 834b6f8..696aeb2 100644 --- a/Patcher/Checker.cs +++ b/Patcher/Checker.cs @@ -15,6 +15,7 @@ namespace Patcher { private readonly ICheckParams checkParams; public Checker(ICheckParams checkParams) { + Logger.LogDir = checkParams.LogDir; this.checkParams = checkParams; } diff --git a/Patcher/Context.cs b/Patcher/Context.cs index 8e4b50a..ce6bd2e 100644 --- a/Patcher/Context.cs +++ b/Patcher/Context.cs @@ -50,25 +50,4 @@ namespace Patcher } - class Logger : ILogger { - - public static readonly ILogger instance = new Logger(); - - private readonly StreamWriter writer; - - private readonly object locker = new object(); - - private Logger() { - this.writer = new StreamWriter("C:\\Program Files\\FLocal\\main\\debug\\data\\Logs\\" + DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss") + ".patcher.txt"); - } - - void ILogger.Log(string message) { - lock(this.locker) { - this.writer.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffffff") + ": " + message); - this.writer.Flush(); - } - } - - } - } diff --git a/Patcher/ICheckParams.cs b/Patcher/ICheckParams.cs index 288d68e..b2546e6 100644 --- a/Patcher/ICheckParams.cs +++ b/Patcher/ICheckParams.cs @@ -26,5 +26,9 @@ namespace Patcher IEnumerable getPatchesList(); + string LogDir { + get; + } + } } diff --git a/Patcher/Logger.cs b/Patcher/Logger.cs new file mode 100644 index 0000000..61fb7e0 --- /dev/null +++ b/Patcher/Logger.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.IO; +using Web.Core; + +namespace Patcher { + + class Logger : ILogger { + + public static string LogDir { + set { + lock(_instance.locker) { + _instance.writer = new StreamWriter(Path.Combine(value, DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss") + ".patcher.txt")); + } + } + } + + private static readonly Logger _instance = new Logger(); + public static readonly ILogger instance = _instance; + + private StreamWriter writer; + + private readonly object locker = new object(); + + private Logger() { + } + + void ILogger.Log(string message) { + lock(this.locker) { + this.writer.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffffff") + ": " + message); + this.writer.Flush(); + } + } + + } + +} diff --git a/Patcher/Patcher.csproj b/Patcher/Patcher.csproj index e90bf70..df3814a 100644 --- a/Patcher/Patcher.csproj +++ b/Patcher/Patcher.csproj @@ -96,6 +96,7 @@ + diff --git a/Patcher/Updater.cs b/Patcher/Updater.cs index 8a65389..0e6a357 100644 --- a/Patcher/Updater.cs +++ b/Patcher/Updater.cs @@ -22,6 +22,7 @@ namespace Patcher private readonly Context context; public Updater(IUpdateParams updateParams, IInteractiveConsole console) { + Logger.LogDir = updateParams.LogDir; this.context = new Context(updateParams, console); } diff --git a/export-info.bat b/export-info.bat index f5c55d7..3da5d24 100644 --- a/export-info.bat +++ b/export-info.bat @@ -2,4 +2,4 @@ svn export . exported tree exported /f > Resources\FLocal\static\info\tree.txt rmdir /s /q exported -svn log -r HEAD:0 -v > Resources\FLocal\static\info\svnlog.txt +svn log -r HEAD:0 -v .. > Resources\FLocal\static\info\svnlog.txt