From 23c8348ab9e0da20f16cadb565e4cb66bae79d59 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 26 Dec 2012 15:17:30 -0100 Subject: [PATCH] U-7 Only Audit Logs should go to UmbracoLog, the rest goes to LogHelper --- src/umbraco.businesslogic/Log.cs | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/src/umbraco.businesslogic/Log.cs b/src/umbraco.businesslogic/Log.cs index 63d9268fee..14555e48e1 100644 --- a/src/umbraco.businesslogic/Log.cs +++ b/src/umbraco.businesslogic/Log.cs @@ -1,6 +1,7 @@ using System; using System.Data; using System.Diagnostics; +using System.Globalization; using System.Threading; using Umbraco.Core.Logging; using umbraco.DataLayer; @@ -164,19 +165,28 @@ namespace umbraco.BusinessLogic /// The comment. public static void AddSynced(LogTypes type, int userId, int nodeId, string comment) { - try + var logTypeIsAuditType = type.GetType().GetField(type.ToString()).GetCustomAttributes(typeof(AuditTrailLogItem), true).Length != 0; + + if (logTypeIsAuditType) { - SqlHelper.ExecuteNonQuery( - "insert into umbracoLog (userId, nodeId, logHeader, logComment) values (@userId, @nodeId, @logHeader, @comment)", - SqlHelper.CreateParameter("@userId", userId), - SqlHelper.CreateParameter("@nodeId", nodeId), - SqlHelper.CreateParameter("@logHeader", type.ToString()), - SqlHelper.CreateParameter("@comment", comment)); + try + { + SqlHelper.ExecuteNonQuery( + "insert into umbracoLog (userId, nodeId, logHeader, logComment) values (@userId, @nodeId, @logHeader, @comment)", + SqlHelper.CreateParameter("@userId", userId), + SqlHelper.CreateParameter("@nodeId", nodeId), + SqlHelper.CreateParameter("@logHeader", type.ToString()), + SqlHelper.CreateParameter("@comment", comment)); + } + catch (Exception e) + { + Debug.WriteLine(e.ToString(), "Error"); + Trace.WriteLine(e.ToString()); + } } - catch (Exception e) + else { - Debug.WriteLine(e.ToString(), "Error"); - Trace.WriteLine(e.ToString()); + LogHelper.Info(string.Format("Redirected log call (please use Umbraco.Core.Logging.LogHelper instead of umbraco.BusinessLogic.Log) | Type: {0} | User: {1} | NodeId: {2} | Comment: {3}", type.ToString(), userId, nodeId.ToString(CultureInfo.InvariantCulture), comment)); } }