Suppressing execution context flow on create/update/delete

Author: alrod

src/WebJobs.Script.WebHost/Controllers/FunctionsController.cs

@@ -78,7 +78,7 @@ public async Task<IActionResult> CreateOrUpdate(string name, [FromBody] Function
             {
                 (success, configChanged, functionMetadataResponse) = await _functionsManager.CreateOrUpdate(name, functionMetadata, Request);
             }
-            await fileMonitoringService.ScheduleRestartAsync(false);
+            await ScheduleRestartAsync(fileMonitoringService);
 
             if (success)
             {
@@ -175,11 +175,11 @@ public async Task<IActionResult> Delete(string name, [FromServices] IFileMonitor
 
             bool deleted;
             string error;
-            using (fileMonitoringService?.SuspendRestart())
+            using (fileMonitoringService.SuspendRestart())
             {
                 (deleted, error) = await _functionsManager.TryDeleteFunction(function);
             }
-            await fileMonitoringService?.ScheduleRestartAsync(false);
+            await ScheduleRestartAsync(fileMonitoringService);
 
             if (deleted)
             {
@@ -220,5 +220,15 @@ public IActionResult Download([FromServices] IOptions<ScriptApplicationHostOptio
                 FileDownloadName = (System.Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME") ?? "functions") + ".zip"
             };
         }
+
+        private async Task ScheduleRestartAsync(IFileMonitoringService fileMonitoringService)
+        {
+            Task restartTask = null;
+            using (System.Threading.ExecutionContext.SuppressFlow())
+            {
+                restartTask = fileMonitoringService.ScheduleRestartAsync(false);
+            }
+            await restartTask;
+        }
     }
 }