Skip to content

Commit d7220f2

Browse files
committed
initializing ScriptHost before adding it to _liveInstances collection
1 parent bd30f72 commit d7220f2

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/WebJobs.Script/Host/ScriptHostManager.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,17 +170,17 @@ public bool CanInvoke()
170170

171171
newInstance = _scriptHostFactory.Create(_environment, EventManager, _settingsManager, _config);
172172
_currentInstance = newInstance;
173-
lock (_liveInstances)
174-
{
175-
_liveInstances.Add(newInstance);
176-
_hostStartCount++;
177-
}
178173

179174
newInstance.HostInitializing += OnHostInitializing;
180175
newInstance.HostInitialized += OnHostInitialized;
181176
newInstance.HostStarted += OnHostStarted;
182177
newInstance.Initialize();
183178

179+
lock (_liveInstances)
180+
{
181+
_liveInstances.Add(newInstance);
182+
}
183+
184184
newInstance.StartAsync(cancellationToken).GetAwaiter().GetResult();
185185

186186
// log any function initialization errors
@@ -286,7 +286,7 @@ private void OnHostInitializing(object sender, EventArgs e)
286286
var host = (ScriptHost)sender;
287287
string extensionVersion = _settingsManager.GetSetting(EnvironmentSettingNames.FunctionsExtensionVersion);
288288
string hostId = host.ScriptConfig.HostConfig.HostId;
289-
string message = $"Starting Host (HostId={hostId}, Version={ScriptHost.Version}, InstanceId={host.InstanceId}, ProcessId={Process.GetCurrentProcess().Id}, AppDomainId={AppDomain.CurrentDomain.Id}, Debug={host.InDebugMode}, ConsecutiveErrors={_consecutiveErrorCount}, StartupCount={_hostStartCount}, FunctionsExtensionVersion={extensionVersion})";
289+
string message = $"Starting Host (HostId={hostId}, Version={ScriptHost.Version}, InstanceId={host.InstanceId}, ProcessId={Process.GetCurrentProcess().Id}, AppDomainId={AppDomain.CurrentDomain.Id}, Debug={host.InDebugMode}, ConsecutiveErrors={_consecutiveErrorCount}, StartupCount={++_hostStartCount}, FunctionsExtensionVersion={extensionVersion})";
290290
host.TraceWriter.Info(message);
291291
host.Logger.LogInformation(message);
292292

0 commit comments

Comments
 (0)