Skip to content

Bugfix/supervision maintenance mode #158

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

Merged
ewoutp merged 3 commits into from
May 17, 2018
Merged

Bugfix/supervision maintenance mode #158

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8531776
Fixed expected value for supervision maintenance mode
ewoutp May 15, 2018
d3bba59
Log start
ewoutp May 15, 2018
2a2e389
Removed additional log line
ewoutp May 17, 2018
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
16 changes: 15 additions & 1 deletion service/upgrade_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ func (m *upgradeManager) disableSupervision(ctx context.Context) error {
err := api.ReadKey(ctx, superVisionStateKey, &value)
if err != nil {
m.log.Warningf("Failed to read supervision state: %v", err)
} else if valueStr, ok := value.(string); !ok {
} else if valueStr, ok := getMaintenanceMode(value); !ok {
m.log.Warningf("Supervision state is not a string but: %v", value)
} else if valueStr != superVisionStateMaintenance {
m.log.Warningf("Supervision state is not yet '%s' but '%s'", superVisionStateMaintenance, valueStr)
Expand All @@ -522,6 +522,20 @@ func (m *upgradeManager) disableSupervision(ctx context.Context) error {
}
}

func getMaintenanceMode(value interface{}) (string, bool) {
if s, ok := value.(string); ok {
return s, true
}
if m, ok := value.(map[string]interface{}); ok {
if mode, ok := m["Mode"]; ok {
return getMaintenanceMode(mode)
} else if mode, ok := m["mode"]; ok {
return getMaintenanceMode(mode)
}
}
return "", false
}

// enableSupervision enabled supervision of the agency.
func (m *upgradeManager) enableSupervision(ctx context.Context) error {
api, err := m.createAgencyAPI()
Expand Down