Skip to content

Commit 87ec218

Browse files
authored
Logging Settings for host split (#9747)
* changes * updating unit test * comments * updating test back * logging change * addressing comments * changing current directory name * debug log
1 parent 92d51f0 commit 87ec218

File tree

2 files changed

+27
-0
lines changed

2 files changed

+27
-0
lines changed

src/WebJobs.Script.WebHost/Diagnostics/Extensions/ScriptHostServiceLoggerExtension.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,12 @@ public static class ScriptHostServiceLoggerExtension
182182
new EventId(529, nameof(HostStateChanged)),
183183
"Host state changed from {previousState} to {newState}.");
184184

185+
private static readonly Action<ILogger, string, Exception> _logHostInitializationSettings =
186+
LoggerMessage.Define<string>(
187+
LogLevel.Debug,
188+
new EventId(530, nameof(LogHostInitializationSettings)),
189+
"{hostInitializationSettings}");
190+
185191
public static void HostStateChanged(this ILogger logger, ScriptHostState previousHostState, ScriptHostState newHostState)
186192
{
187193
var newState = newHostState.ToString();
@@ -323,5 +329,18 @@ public static void ScriptHostServiceRestartCanceledByRuntime(this ILogger logger
323329
{
324330
_scriptHostServiceRestartCanceledByRuntime(logger, null);
325331
}
332+
333+
public static void LogHostInitializationSettings(this ILogger logger, string functionWorkerRuntime, string functionExtensionVersion, string siteExtensionDirectory, bool inStandbyMode)
334+
{
335+
var hostInitializationSettings = $@"{{
336+
""HostInitializationSettings"": {{
337+
""functionsWorkerRuntime"": ""{functionWorkerRuntime}"",
338+
""functionsExtensionVersion"": ""{functionExtensionVersion}"",
339+
""siteExtensionDirectory"": ""{siteExtensionDirectory}"",
340+
""inStandbyMode"": {inStandbyMode}
341+
}}
342+
}}";
343+
_logHostInitializationSettings(logger, hostInitializationSettings, null);
344+
}
326345
}
327346
}

src/WebJobs.Script.WebHost/WebJobsScriptHostService.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,14 @@ private void LogInitialization(IHost host, bool isOffline, int attemptCount, int
685685
// Reading the string from resources to make sure resource loading code path is warmed up during placeholder as well.
686686
logger.InStandByMode(operationId);
687687
}
688+
689+
// Log settings
690+
var functionWorkerRuntime = _environment.GetEnvironmentVariable(FunctionWorkerRuntime);
691+
var functionExtensionVersion = _environment.GetEnvironmentVariable(FunctionsExtensionVersion);
692+
var currentDirectory = Directory.GetCurrentDirectory();
693+
var inStandbyMode = _scriptWebHostEnvironment.InStandbyMode;
694+
695+
logger.LogHostInitializationSettings(functionWorkerRuntime, functionExtensionVersion, currentDirectory, inStandbyMode);
688696
}
689697

690698
private void OnHostHealthCheckTimer(object state)

0 commit comments

Comments
 (0)