Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restart Web App Container after config update #9819

Merged
merged 7 commits into from
Mar 18, 2019
Merged

Restart Web App Container after config update #9819

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9d33e5c
Restart Web App Container after config update
vincent1173 Mar 13, 2019
f5ffc4b
addressed review comments
vincent1173 Mar 18, 2019
9ca7626
make restart call by default
vincent1173 Mar 18, 2019
28e3fb5
added res. for azurefunctionapp task
vincent1173 Mar 18, 2019
49a698d
Merge branch 'master' of https://github.com/Microsoft/vsts-tasks into…
vincent1173 Mar 18, 2019
7d9db0b
fix L0 test
vincent1173 Mar 18, 2019
2f7e569
fix Azure web app L0
vincent1173 Mar 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tasks/AzureFunctionAppContainerV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 2
"Patch": 3
},
"minimumAgentVersion": "2.104.1",
"groups": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFunctionAppContainerV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 2
"Patch": 3
},
"minimumAgentVersion": "2.104.1",
"groups": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFunctionAppV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 4
"Patch": 5
},
"minimumAgentVersion": "2.104.1",
"groups": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFunctionAppV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 4
"Patch": 5
},
"minimumAgentVersion": "2.104.1",
"groups": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureWebAppContainerV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 3
"Patch": 4
},
"minimumAgentVersion": "2.104.1",
"groups": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureWebAppContainerV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 3
"Patch": 4
},
"minimumAgentVersion": "2.104.1",
"groups": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureWebAppV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 4
"Patch": 5
},
"minimumAgentVersion": "2.104.1",
"groups": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureWebAppV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 4
"Patch": 5
},
"minimumAgentVersion": "2.104.1",
"groups": [
Expand Down
11 changes: 2 additions & 9 deletions Tasks/Common/AzureRmDeploy-common/operations/ContainerBasedDeploymentUtility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,8 @@ export class ContainerBasedDeploymentUtility {
tl.debug("Updating the webapp configuration.");
await this._updateConfigurationDetails(properties["ConfigurationSettings"], properties["StartupCommand"], imageName);

tl.debug('Updating web app settings');
await this._updateApplicationSettings(properties["AppSettings"], imageName);
}

private async _updateApplicationSettings(appSettings: any, imageName: string): Promise<void> {
var appSettingsParameters = appSettings ? appSettings.trim() : "";
appSettingsParameters = await this._getContainerRegistrySettings(imageName, null) + ' ' + appSettingsParameters;
var appSettingsNewProperties = parse(appSettingsParameters);
await this._appServiceUtility.updateAndMonitorAppSettings(appSettingsNewProperties);
tl.debug('making a restart request to app service');
await this._appService.restart();
vincent1173 marked this conversation as resolved.
Show resolved Hide resolved
}

private async _updateConfigurationDetails(configSettings: any, startupCommand: string, imageName: string): Promise<void> {
Expand Down