Skip to content

Commit 0266f36

Browse files
soninarenazfuncgh
authored andcommitted
Reverting "Removing MultiLanguage feature flag (#8727)" (#9079)
1 parent d14dde5 commit 0266f36

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

src/WebJobs.Script/Environment/EnvironmentExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ public static bool IsMultiLanguageRuntimeEnvironment(this IEnvironment environme
364364
{
365365
if (!isMultiLanguageEnabled.HasValue)
366366
{
367-
isMultiLanguageEnabled = environment.IsLogicApp();
367+
isMultiLanguageEnabled = environment.IsLogicApp() && FeatureFlags.IsEnabled(ScriptConstants.FeatureFlagEnableMultiLanguageWorker, environment);
368368
}
369369
return isMultiLanguageEnabled.Value;
370370
}

src/WebJobs.Script/ScriptConstants.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ public static class ScriptConstants
122122
public const string FeatureFlagDisableMergedWebHostScriptHostConfiguration = "DisableMergedConfiguration";
123123
public const string FeatureFlagDisableWorkerIndexing = "DisableWorkerIndexing";
124124
public const string FeatureFlagEnableDebugTracing = "EnableDebugTracing";
125+
public const string FeatureFlagEnableMultiLanguageWorker = "EnableMultiLanguageWorker";
125126
public const string FeatureFlagEnableProxies = "EnableProxies";
126127
public const string FeatureFlagEnableLinuxEPExecutionCount = "EnableLinuxFEC";
127128

test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/MultiLanguageEndToEndTests.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public async Task CodelessFunction_CanUse_MultipleLanguageProviders()
3939
var settings = new Dictionary<string, string>()
4040
{
4141
[EnvironmentSettingNames.AppKind] = "workflowApp",
42+
[EnvironmentSettingNames.AzureWebJobsFeatureFlags] = $"{ScriptConstants.FeatureFlagEnableMultiLanguageWorker}",
4243
};
4344
var testEnvironment = new TestEnvironment(settings);
4445

@@ -85,6 +86,7 @@ public async Task CodelessFunction_CanUse_SingleJavaLanguageProviders()
8586
var settings = new Dictionary<string, string>()
8687
{
8788
[EnvironmentSettingNames.AppKind] = "workflowApp",
89+
[EnvironmentSettingNames.AzureWebJobsFeatureFlags] = $"{ScriptConstants.FeatureFlagEnableMultiLanguageWorker}",
8890
};
8991
var testEnvironment = new TestEnvironment(settings);
9092

@@ -124,6 +126,7 @@ public async Task CodelessFunction_CanUse_SingleJavascriptLanguageProviders()
124126
var settings = new Dictionary<string, string>()
125127
{
126128
[EnvironmentSettingNames.AppKind] = "workflowApp",
129+
[EnvironmentSettingNames.AzureWebJobsFeatureFlags] = $"{ScriptConstants.FeatureFlagEnableMultiLanguageWorker}",
127130
};
128131
var testEnvironment = new TestEnvironment(settings);
129132

@@ -163,6 +166,7 @@ public async Task CodelessFunction_CanUse_NoLanguageProviders()
163166
var settings = new Dictionary<string, string>()
164167
{
165168
[EnvironmentSettingNames.AppKind] = "workflowApp",
169+
[EnvironmentSettingNames.AzureWebJobsFeatureFlags] = $"{ScriptConstants.FeatureFlagEnableMultiLanguageWorker}",
166170
};
167171
var testEnvironment = new TestEnvironment(settings);
168172

0 commit comments

Comments
 (0)