From d10cdf9c87e631bcdaca9f2efbe0ba07f4a43aae Mon Sep 17 00:00:00 2001
From: Keivan Beigi <me@keivan.io>
Date: Wed, 15 Oct 2014 19:23:10 -0700
Subject: [PATCH] removed method column from log db.

---
 .../InstrumentationTests/DatabaseTargetFixture.cs  |  1 -
 .../Migration/064_add_remove_method_from_logs.cs   | 14 ++++++++++++++
 .../Instrumentation/DatabaseTarget.cs              |  8 ++------
 src/NzbDrone.Core/Instrumentation/Log.cs           |  2 --
 src/NzbDrone.Core/NzbDrone.Core.csproj             |  1 +
 5 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 src/NzbDrone.Core/Datastore/Migration/064_add_remove_method_from_logs.cs

diff --git a/src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs b/src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs
index c0cc34b57..ea4a63bae 100644
--- a/src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs
+++ b/src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs
@@ -133,7 +133,6 @@ private void VerifyLog(Log logItem, LogLevel level)
             logItem.Time.Should().BeWithin(TimeSpan.FromSeconds(2));
             logItem.Logger.Should().Be(this.GetType().Name);
             logItem.Level.Should().Be(level.Name);
-            logItem.Method.Should().Be(new StackTrace().GetFrame(1).GetMethod().Name);
             _logger.Name.Should().EndWith(logItem.Logger);
         }
     }
diff --git a/src/NzbDrone.Core/Datastore/Migration/064_add_remove_method_from_logs.cs b/src/NzbDrone.Core/Datastore/Migration/064_add_remove_method_from_logs.cs
new file mode 100644
index 000000000..2fd04ea97
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/Migration/064_add_remove_method_from_logs.cs
@@ -0,0 +1,14 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(64)]
+    public class remove_method_from_logs : NzbDroneMigrationBase
+    {
+        protected override void LogDbUpgrade()
+        {
+            Delete.Column("Method").FromTable("Logs");
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs b/src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs
index cc0fc0ccb..4c9ed9eda 100644
--- a/src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs
+++ b/src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs
@@ -18,8 +18,8 @@ public class DatabaseTarget : TargetWithLayout, IHandle<ApplicationShutdownReque
     {
         private readonly SQLiteConnection _connection;
 
-        const string INSERT_COMMAND = "INSERT INTO [Logs]([Message],[Time],[Logger],[Method],[Exception],[ExceptionType],[Level]) " +
-                                      "VALUES(@Message,@Time,@Logger,@Method,@Exception,@ExceptionType,@Level)";
+        const string INSERT_COMMAND = "INSERT INTO [Logs]([Message],[Time],[Logger],[Exception],[ExceptionType],[Level]) " +
+                                      "VALUES(@Message,@Time,@Logger,@Exception,@ExceptionType,@Level)";
 
         public DatabaseTarget(IConnectionStringFactory connectionStringFactory)
         {
@@ -28,8 +28,6 @@ public DatabaseTarget(IConnectionStringFactory connectionStringFactory)
 
         public void Register()
         {
-            Layout = new SimpleLayout("${callsite:className=false:fileName=false:includeSourcePath=false:methodName=true}");
-
             Rule = new LoggingRule("*", LogLevel.Info, this);
 
             LogManager.Configuration.AddTarget("DbLogger", this);
@@ -61,7 +59,6 @@ protected override void Write(LogEventInfo logEvent)
                 var log = new Log();
                 log.Time = logEvent.TimeStamp;
                 log.Message = CleanseLogMessage.Cleanse(logEvent.FormattedMessage);
-                log.Method = Layout.Render(logEvent);
 
                 log.Logger = logEvent.LoggerName;
 
@@ -94,7 +91,6 @@ protected override void Write(LogEventInfo logEvent)
                 sqlCommand.Parameters.Add(new SQLiteParameter("Message", DbType.String) { Value = log.Message });
                 sqlCommand.Parameters.Add(new SQLiteParameter("Time", DbType.DateTime) { Value = log.Time });
                 sqlCommand.Parameters.Add(new SQLiteParameter("Logger", DbType.String) { Value = log.Logger });
-                sqlCommand.Parameters.Add(new SQLiteParameter("Method", DbType.String) { Value = log.Method });
                 sqlCommand.Parameters.Add(new SQLiteParameter("Exception", DbType.String) { Value = log.Exception });
                 sqlCommand.Parameters.Add(new SQLiteParameter("ExceptionType", DbType.String) { Value = log.ExceptionType });
                 sqlCommand.Parameters.Add(new SQLiteParameter("Level", DbType.String) { Value = log.Level });
diff --git a/src/NzbDrone.Core/Instrumentation/Log.cs b/src/NzbDrone.Core/Instrumentation/Log.cs
index 58119c84c..67cd0c1f9 100644
--- a/src/NzbDrone.Core/Instrumentation/Log.cs
+++ b/src/NzbDrone.Core/Instrumentation/Log.cs
@@ -13,8 +13,6 @@ public class Log : ModelBase
 
         public string Logger { get; set; }
 
-        public string Method { get; set; }
-
         public string Exception { get; set; }
 
         public string ExceptionType { get; set; }
diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj
index 56b13d5fe..d617dda58 100644
--- a/src/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/src/NzbDrone.Core/NzbDrone.Core.csproj
@@ -225,6 +225,7 @@
     <Compile Include="Datastore\Migration\058_drop_epsiode_file_path.cs" />
     <Compile Include="Datastore\Migration\059_add_enable_options_to_indexers.cs" />
     <Compile Include="Datastore\Migration\063_add_remotepathmappings.cs" />
+    <Compile Include="Datastore\Migration\064_add_remove_method_from_logs.cs" />
     <Compile Include="Datastore\Migration\061_clear_bad_scene_names.cs" />
     <Compile Include="Datastore\Migration\060_remove_enable_from_indexers.cs" />
     <Compile Include="Datastore\Migration\062_convert_quality_models.cs" />