Skip to content

Commit b61a5a9

Browse files
Cleanup log level handling.
Especially one rogue change causing all subsequent test to have NHibernate.SQL logger enabled.
1 parent 468be40 commit b61a5a9

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

src/NHibernate.Test/Async/NHSpecificTest/Logs/LogsFixture.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public class TextLogSpy : IDisposable
7272
private readonly TextWriterAppender appender;
7373
private readonly Logger loggerImpl;
7474
private readonly StringBuilder stringBuilder;
75+
private readonly Level previousLevel;
7576

7677
public TextLogSpy(string loggerName, string pattern)
7778
{
@@ -84,6 +85,7 @@ public TextLogSpy(string loggerName, string pattern)
8485
};
8586
loggerImpl = (Logger)LogManager.GetLogger(typeof(LogsFixtureAsync).Assembly, loggerName).Logger;
8687
loggerImpl.AddAppender(appender);
88+
previousLevel = loggerImpl.Level;
8789
loggerImpl.Level = Level.All;
8890
}
8991

@@ -98,9 +100,10 @@ public string[] Events
98100
public void Dispose()
99101
{
100102
loggerImpl.RemoveAppender(appender);
103+
loggerImpl.Level = previousLevel;
101104
}
102105
}
103106
}
104107

105108

106-
}
109+
}

src/NHibernate.Test/NHSpecificTest/Logs/LogsFixture.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public class TextLogSpy : IDisposable
6161
private readonly TextWriterAppender appender;
6262
private readonly Logger loggerImpl;
6363
private readonly StringBuilder stringBuilder;
64+
private readonly Level previousLevel;
6465

6566
public TextLogSpy(string loggerName, string pattern)
6667
{
@@ -73,6 +74,7 @@ public TextLogSpy(string loggerName, string pattern)
7374
};
7475
loggerImpl = (Logger)LogManager.GetLogger(typeof(LogsFixture).Assembly, loggerName).Logger;
7576
loggerImpl.AddAppender(appender);
77+
previousLevel = loggerImpl.Level;
7678
loggerImpl.Level = Level.All;
7779
}
7880

@@ -87,9 +89,10 @@ public string[] Events
8789
public void Dispose()
8890
{
8991
loggerImpl.RemoveAppender(appender);
92+
loggerImpl.Level = previousLevel;
9093
}
9194
}
9295
}
9396

9497

95-
}
98+
}

src/NHibernate.Test/SystemTransactions/ResourceManagerFixture.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,6 @@ void Clone_TransactionCompleted(object sender, TransactionEventArgs e)
684684
[OneTimeSetUp]
685685
public void TestFixtureSetUp()
686686
{
687-
((Logger)_log.Logger).Level = log4net.Core.Level.Info;
688687
_spy = new LogSpy(_log);
689688
_spy.Appender.Layout = new PatternLayout("%d{ABSOLUTE} [%t] - %m%n");
690689
}

0 commit comments

Comments
 (0)