Skip to content

Commit 5212c3f

Browse files
committed
Fixed certain errors in logging
1 parent bc11715 commit 5212c3f

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Orm/Xtensive.Orm/Orm/Logging/BaseLog.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public IndentManager.IndentScope DebugRegion(string messageId, params object[] p
4040
ArgumentValidator.EnsureArgumentNotNull(messageId, "message");
4141
if (!IsLogged(LogLevel.Debug))
4242
return IndentManager.IncreaseIndent();
43-
var message = Strings.ResourceManager.GetString(messageId, Strings.Culture);
43+
var message = Strings.ResourceManager.GetString(messageId, Strings.Culture) ?? messageId;
4444
var title = parameters!=null ? string.Format(message, parameters) : message;
4545
var titleParams = new object[] { title };
4646
Debug(nameof(Strings.LogRegionBegin), titleParams);
@@ -63,7 +63,7 @@ public IndentManager.IndentScope InfoRegion(string messageId, params object[] pa
6363
ArgumentValidator.EnsureArgumentNotNull(messageId, "message");
6464
if (!IsLogged(LogLevel.Info))
6565
return IndentManager.IncreaseIndent();
66-
var message = Strings.ResourceManager.GetString(messageId, Strings.Culture);
66+
var message = Strings.ResourceManager.GetString(messageId, Strings.Culture) ?? messageId;
6767
var title = parameters!=null ? string.Format(message, parameters) : message;
6868
Info(string.Format(Strings.LogRegionBegin, title));
6969
return IndentManager.IncreaseIndent(() => Info(string.Format(Strings.LogRegionEnd, title)));
@@ -135,7 +135,9 @@ public virtual void FatalError(string messageId, object[] parameters = null, Exc
135135

136136
private void Write(LogLevel logLevel, string messageId, object[] parameters, Exception exception)
137137
{
138-
var message = Strings.ResourceManager.GetString(messageId, Strings.Culture) ?? messageId;
138+
var message = string.IsNullOrEmpty(messageId)
139+
? null
140+
: Strings.ResourceManager.GetString(messageId, Strings.Culture) ?? messageId;
139141
Write(new LogEventInfo(Name, logLevel, message, parameters, exception));
140142
}
141143

0 commit comments

Comments
 (0)