瀏覽代碼

Revert "Mark server as unlicensed when ee checks fail"

This reverts commit 77c6dbdd3c9cfa6e7d6becedef6251e8617ae367.
gabrielseibel1 2 年之前
父節點
當前提交
2bef48d1a4
共有 3 個文件被更改,包括 6 次插入18 次删除
  1. 2 7
      ee/initialize.go
  2. 3 6
      logic/server.go
  3. 1 5
      main.go

+ 2 - 7
ee/initialize.go

@@ -11,7 +11,6 @@ import (
 	"github.com/gravitl/netmaker/logic"
 	"github.com/gravitl/netmaker/models"
 	"github.com/gravitl/netmaker/servercfg"
-	"golang.org/x/exp/slog"
 )
 
 // InitEE - Initialize EE Logic
@@ -26,18 +25,14 @@ func InitEE() {
 		ee_controllers.UserGroupsHandlers,
 		ee_controllers.RelayHandlers,
 	)
-	logic.EnterpriseCheckFuncs = append(logic.EnterpriseCheckFuncs, func() error {
+	logic.EnterpriseCheckFuncs = append(logic.EnterpriseCheckFuncs, func() {
 		// == License Handling ==
-		if err := ValidateLicense(); err != nil {
-			slog.Error(err.Error())
-			return err
-		}
+		ValidateLicense()
 		logger.Log(0, "proceeding with Paid Tier license")
 		logic.SetFreeTierForTelemetry(false)
 		// == End License Handling ==
 		AddLicenseHooks()
 		resetFailover()
-		return nil
 	})
 	logic.EnterpriseFailoverFunc = eelogic.SetFailover
 	logic.EnterpriseResetFailoverFunc = eelogic.ResetFailover

+ 3 - 6
logic/server.go

@@ -6,7 +6,7 @@ import (
 )
 
 // EnterpriseCheckFuncs - can be set to run functions for EE
-var EnterpriseCheckFuncs []func() error
+var EnterpriseCheckFuncs []func()
 
 // EnterpriseFailoverFunc - interface to control failover funcs
 var EnterpriseFailoverFunc func(node *models.Node) error
@@ -26,11 +26,8 @@ const KUBERNETES_LISTEN_PORT = 31821
 const KUBERNETES_SERVER_MTU = 1024
 
 // EnterpriseCheck - Runs enterprise functions if presented
-func EnterpriseCheck() error {
+func EnterpriseCheck() {
 	for _, check := range EnterpriseCheckFuncs {
-		if err := check(); err != nil {
-			return err
-		}
+		check()
 	}
-	return nil
 }

+ 1 - 5
main.go

@@ -91,11 +91,7 @@ func initialize() { // Client Mode Prereq Check
 	if err != nil {
 		logger.Log(1, "Timer error occurred: ", err.Error())
 	}
-
-	if err := logic.EnterpriseCheck(); err != nil {
-		servercfg.IsUnlicensed = true
-		return
-	}
+	logic.EnterpriseCheck()
 
 	var authProvider = auth.InitializeAuthProvider()
 	if authProvider != "" {