actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-12 15:13:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Log template errors as debug messages under feature flag

Browse Source
This commit is contained in:
JoannaaKL
2023-06-01 14:13:06 +00:00
committed by GitHub
parent 7c1ea89b87
commit d056e8fa08
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Runner.Common/Constants.cs
View File

@@ -155,6 +155,7 @@ namespace GitHub.Runner.Common
{ {
public static readonly string DiskSpaceWarning = "runner.diskspace.warning"; public static readonly string DiskSpaceWarning = "runner.diskspace.warning";
public static readonly string Node12Warning = "DistributedTask.AddWarningToNode12Action"; public static readonly string Node12Warning = "DistributedTask.AddWarningToNode12Action";
public static readonly string LogTemplateErrorsAsDebugMessage = "DistributedTask.LogTemplateErrorsAsDebugMessage";
public static readonly string UseContainerPathForTemplate = "DistributedTask.UseContainerPathForTemplate"; public static readonly string UseContainerPathForTemplate = "DistributedTask.UseContainerPathForTemplate";
public static readonly string AllowRunnerContainerHooks = "DistributedTask.AllowRunnerContainerHooks"; public static readonly string AllowRunnerContainerHooks = "DistributedTask.AllowRunnerContainerHooks";
} }

9
src/Runner.Worker/ExecutionContext.cs
View File

@@ -21,6 +21,7 @@ using Newtonsoft.Json;
using Sdk.RSWebApi.Contracts; using Sdk.RSWebApi.Contracts;
using ObjectTemplating = GitHub.DistributedTask.ObjectTemplating; using ObjectTemplating = GitHub.DistributedTask.ObjectTemplating;
using Pipelines = GitHub.DistributedTask.Pipelines; using Pipelines = GitHub.DistributedTask.Pipelines;
using constants = GitHub.Runner.Common.Constants;
namespace GitHub.Runner.Worker namespace GitHub.Runner.Worker
{ {
@@ -1401,9 +1402,15 @@ namespace GitHub.Runner.Worker
public void Error(string format, params Object[] args) public void Error(string format, params Object[] args)
{ {
_executionContext.Error(string.Format(CultureInfo.CurrentCulture, format, args)); _executionContext.Global.EnvironmentVariables.TryGetValue(Constants.Runner.Features.LogTemplateErrorsAsDebugMessage, out var logErrorsAsDebug);
if (StringUtil.ConvertToBoolean(logErrorsAsDebug, defaultValue: false))
{
_executionContext.Debug(string.Format(CultureInfo.CurrentCulture, format, args));
}
else _executionContext.Error(string.Format(CultureInfo.CurrentCulture, format, args));
} }
public void Info(string format, params Object[] args) public void Info(string format, params Object[] args)
{ {
_executionContext.Debug(string.Format(CultureInfo.CurrentCulture, $"{format}", args)); _executionContext.Debug(string.Format(CultureInfo.CurrentCulture, $"{format}", args));

9
src/Sdk/DTObjectTemplating/ObjectTemplating/TemplateContext.cs
View File

@@ -152,13 +152,10 @@ namespace GitHub.DistributedTask.ObjectTemplating
String message) String message)
{ {
var prefix = GetErrorPrefix(fileId, line, column); var prefix = GetErrorPrefix(fileId, line, column);
if (!String.IsNullOrEmpty(prefix)) var fullMessage = !String.IsNullOrEmpty(prefix) ? $"{prefix} {message}" : message;
{
message = $"{prefix} {message}";
}
Errors.Add(message); Errors.Add(fullMessage);
TraceWriter.Error(message); TraceWriter.Error(fullMessage);
} }
internal INamedValueInfo[] GetExpressionNamedValues() internal INamedValueInfo[] GetExpressionNamedValues()