Merge branch 'develop' into oath-poc

2019-02-04 09:19:12 +13:00
parent 90281fd7f0 9b6b6e09ae
commit 508352f4ea
53 changed files with 626 additions and 452 deletions
--- a/api/cmd/portainer/main.go
+++ b/api/cmd/portainer/main.go
@@ -492,7 +492,10 @@ func initExtensionManager(fileService portainer.FileService, extensionService po
 	for _, extension := range extensions {
 		err := extensionManager.EnableExtension(&extension, extension.License.LicenseKey)
 		if err != nil {
-			return nil, err
+			log.Printf("Unable to enable extension: %s [extension: %s]", err.Error(), extension.Name)
+			extension.Enabled = false
+			extension.License.Valid = false
+			extensionService.Persist(&extension)
 		}
 	}