From 2e27707b5d92fd228a8cfc7e5165fa83c2647e25 Mon Sep 17 00:00:00 2001 From: alrod Date: Sat, 7 Oct 2017 11:41:41 -0700 Subject: [PATCH] Log value of FUNCTIONS_EXTENSION_VERSION on host start. Fixes #1835 --- src/WebJobs.Script/EnvironmentSettingNames.cs | 1 + src/WebJobs.Script/Host/ScriptHostManager.cs | 5 +++-- .../Host/WebScriptHostManagerTests.cs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/WebJobs.Script/EnvironmentSettingNames.cs b/src/WebJobs.Script/EnvironmentSettingNames.cs index f84be80df4..b5b491c6d1 100644 --- a/src/WebJobs.Script/EnvironmentSettingNames.cs +++ b/src/WebJobs.Script/EnvironmentSettingNames.cs @@ -23,5 +23,6 @@ public static class EnvironmentSettingNames public const string AzureWebJobsSecretStorageType = "AzureWebJobsSecretStorageType"; public const string AppInsightsInstrumentationKey = "APPINSIGHTS_INSTRUMENTATIONKEY"; public const string ProxySiteExtensionEnabledKey = "ROUTING_EXTENSION_VERSION"; + public const string FunctionsExtensionVersion = "FUNCTIONS_EXTENSION_VERSION"; } } diff --git a/src/WebJobs.Script/Host/ScriptHostManager.cs b/src/WebJobs.Script/Host/ScriptHostManager.cs index d44a561c89..03fa8dfeee 100644 --- a/src/WebJobs.Script/Host/ScriptHostManager.cs +++ b/src/WebJobs.Script/Host/ScriptHostManager.cs @@ -143,8 +143,9 @@ public bool CanInvoke() OnHostCreated(); - string message = string.Format("Starting Host (HostId={0}, Version={1}, ProcessId={2}, Debug={3}, Attempt={4})", - newInstance.ScriptConfig.HostConfig.HostId, ScriptHost.Version, Process.GetCurrentProcess().Id, newInstance.InDebugMode.ToString(), consecutiveErrorCount); + string message = string.Format("Starting Host (HostId={0}, Version={1}, ProcessId={2}, Debug={3}, Attempt={4}, FunctionsExtensionVersion={5})", + newInstance.ScriptConfig.HostConfig.HostId, ScriptHost.Version, Process.GetCurrentProcess().Id, newInstance.InDebugMode.ToString(), consecutiveErrorCount, + _settingsManager.GetSetting(EnvironmentSettingNames.FunctionsExtensionVersion)); _traceWriter?.Info(message); _logger?.LogInformation(message); diff --git a/test/WebJobs.Script.Tests.Integration/Host/WebScriptHostManagerTests.cs b/test/WebJobs.Script.Tests.Integration/Host/WebScriptHostManagerTests.cs index 56431f35ba..1ea35d90ae 100644 --- a/test/WebJobs.Script.Tests.Integration/Host/WebScriptHostManagerTests.cs +++ b/test/WebJobs.Script.Tests.Integration/Host/WebScriptHostManagerTests.cs @@ -319,7 +319,7 @@ public Fixture() "Info Host lock lease acquired by instance ID '(.+)'", "Info Function 'Excluded' is marked as excluded", @"Info Generating ([0-9]+) job function\(s\)", - @"Info Starting Host \(HostId=function-tests-node, Version=(.+), ProcessId=[0-9]+, Debug=False, Attempt=0\)", + @"Info Starting Host \(HostId=function-tests-node, Version=(.+), ProcessId=[0-9]+, Debug=False, Attempt=0, FunctionsExtensionVersion=\)", "Info WebJobs.Indexing Found the following functions:", "Info The next 5 occurrences of the schedule will be:", "Info WebJobs.Host Job host started",