Skip to content

Commit aca1b2c

Browse files
authored
[Rpc]Remove LanguageWorkerConsoleLog prefix (#6576) (#6579)
1 parent e5bbff2 commit aca1b2c

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/WebJobs.Script/Workers/ProcessManagement/WorkerProcess.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ private void OnOutputDataReceived(object sender, DataReceivedEventArgs e)
157157
}
158158
}
159159

160-
private void BuildAndLogConsoleLog(string msg, LogLevel level)
160+
internal void BuildAndLogConsoleLog(string msg, LogLevel level)
161161
{
162162
ConsoleLog consoleLog = new ConsoleLog()
163163
{
@@ -166,8 +166,7 @@ private void BuildAndLogConsoleLog(string msg, LogLevel level)
166166
};
167167
if (WorkerProcessUtilities.IsConsoleLog(msg))
168168
{
169-
consoleLog.Message = WorkerProcessUtilities.RemoveLogPrefix(msg);
170-
_workerProcessLogger?.Log(level, msg);
169+
_workerProcessLogger?.LogDebug(WorkerProcessUtilities.RemoveLogPrefix(msg));
171170
}
172171
else
173172
{

test/WebJobs.Script.Tests/Workers/WorkerConsoleLogServiceTests.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,13 @@ public async Task WorkerConsoleLogService_ConsoleLogs_LogLevel_Expected(bool use
3232
workerProcess.ParseErrorMessageAndLog("Test Message No keyword");
3333
workerProcess.ParseErrorMessageAndLog("Test Error Message");
3434
workerProcess.ParseErrorMessageAndLog("Test Warning Message");
35+
36+
workerProcess.BuildAndLogConsoleLog("LanguageWorkerConsoleLog[Test worker log]", LogLevel.Information);
37+
3538
_ = _workerConsoleLogService.ProcessLogs().ContinueWith(t => { });
3639
await _workerConsoleLogService.StopAsync(System.Threading.CancellationToken.None);
3740
var allLogs = _testLogger.GetLogMessages();
38-
Assert.True(allLogs.Count == 3);
41+
Assert.True(allLogs.Count == 4);
3942
VerifyLogLevel(allLogs, "Test Error Message", LogLevel.Error);
4043
VerifyLogLevel(allLogs, "Test Warning Message", LogLevel.Warning);
4144
if (useStdErrForErroLogsOnly)
@@ -46,12 +49,15 @@ public async Task WorkerConsoleLogService_ConsoleLogs_LogLevel_Expected(bool use
4649
{
4750
VerifyLogLevel(allLogs, "Test Message No keyword", LogLevel.Information);
4851
}
52+
53+
VerifyLogLevel(allLogs, "[Test worker log]", LogLevel.Debug);
4954
}
5055

5156
private static void VerifyLogLevel(IList<LogMessage> allLogs, string msg, LogLevel expectedLevel)
5257
{
5358
var message = allLogs.Where(l => l.FormattedMessage.Contains(msg)).FirstOrDefault();
5459
Assert.NotNull(message);
60+
Assert.DoesNotContain(WorkerConstants.LanguageWorkerConsoleLogPrefix, message.FormattedMessage);
5561
Assert.Equal(expectedLevel, message.Level);
5662
}
5763
}

0 commit comments

Comments
 (0)