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 @@ namespace NzbDrone.Core.Test.InstrumentationTests
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 @@ namespace NzbDrone.Core.Instrumentation
{
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 @@ namespace NzbDrone.Core.Instrumentation
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 @@ namespace NzbDrone.Core.Instrumentation
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 @@ namespace NzbDrone.Core.Instrumentation
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 @@ namespace NzbDrone.Core.Instrumentation
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 @@
+