mirror/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2024-12-27 02:07:41 +00:00
Code Issues Releases Wiki Activity

tweaked logging tests.

Browse source
This commit is contained in:
kay.one 2013-03-26 21:03:02 -07:00
parent 22bbf83e42
commit ccba527e89
4 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
NzbDrone.Core.Test/Framework/DbTest.cs
View file

@ -68,6 +68,16 @@ namespace NzbDrone.Core.Test.Framework
private ITestDatabase _db; private ITestDatabase _db;
private IDatabase _database; private IDatabase _database;
protected virtual MigrationType MigrationType
{
get
{
return MigrationType.Main;
}
}
protected ITestDatabase Db protected ITestDatabase Db
{ {
get get
@ -87,7 +97,7 @@ namespace NzbDrone.Core.Test.Framework
MapRepository.Instance.EnableTraceLogging = true; MapRepository.Instance.EnableTraceLogging = true;
var factory = new DbFactory(new MigrationController(new NlogAnnouncer())); var factory = new DbFactory(new MigrationController(new NlogAnnouncer()));
_database = factory.Create(_dbName); _database = factory.Create(_dbName, MigrationType);
_db = new TestTestDatabase(_database); _db = new TestTestDatabase(_database);
Mocker.SetConstant(_database); Mocker.SetConstant(_database);
} }

8
NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs
View file

@ -20,6 +20,14 @@ namespace NzbDrone.Core.Test.InstrumentationTests
private static string _uniqueMessage; private static string _uniqueMessage;
Logger _logger; Logger _logger;
protected override MigrationType MigrationType
{
get
{
return MigrationType.Log;
}
}
[SetUp] [SetUp]
public void Setup() public void Setup()
{ {

4
NzbDrone.Core/Datastore/Migration/Migration20130324.cs
View file

@ -151,11 +151,11 @@ namespace NzbDrone.Core.Datastore.Migration
protected override void LogDbUpgrade() protected override void LogDbUpgrade()
{ {
Create.Table("Logs") Create.Table("Logs")
.WithColumn("LogId").AsInt64().PrimaryKey().Identity() .WithColumn("Id").AsInt32().PrimaryKey().Identity()
.WithColumn("Message").AsString().NotNullable() .WithColumn("Message").AsString().NotNullable()
.WithColumn("Time").AsDateTime().NotNullable() .WithColumn("Time").AsDateTime().NotNullable()
.WithColumn("Logger").AsString().NotNullable() .WithColumn("Logger").AsString().NotNullable()
.WithColumn("Method").AsString().NotNullable() .WithColumn("Method").AsString().Nullable()
.WithColumn("Exception").AsString().Nullable() .WithColumn("Exception").AsString().Nullable()
.WithColumn("ExceptionType").AsString().Nullable() .WithColumn("ExceptionType").AsString().Nullable()
.WithColumn("Level").AsString().NotNullable(); .WithColumn("Level").AsString().NotNullable();

6
NzbDrone.Core/Instrumentation/DatabaseTarget.cs
View file

@ -31,7 +31,11 @@ namespace NzbDrone.Core.Instrumentation
log.Time = logEvent.TimeStamp; log.Time = logEvent.TimeStamp;
log.Message = logEvent.FormattedMessage; log.Message = logEvent.FormattedMessage;
log.Method = logEvent.UserStackFrame.GetMethod().Name; if (logEvent.UserStackFrame != null)
{
log.Method = logEvent.UserStackFrame.GetMethod().Name;
}
log.Logger = logEvent.LoggerName; log.Logger = logEvent.LoggerName;
if (log.Logger.StartsWith("NzbDrone.")) if (log.Logger.StartsWith("NzbDrone."))