瀏覽代碼

fix local variables

theguy951357 2 年之前
父節點
當前提交
7853d2aa6c
共有 2 個文件被更改,包括 7 次插入7 次删除
  1. 3 3
      ee/license.go
  2. 4 4
      servercfg/serverconf.go

+ 3 - 3
ee/license.go

@@ -48,9 +48,9 @@ func AddLicenseHooks() {
 // if license is not valid, server should terminate
 // if license is not valid, server should terminate
 func ValidateLicense() error {
 func ValidateLicense() error {
 	licenseKeyValue := servercfg.GetLicenseKey()
 	licenseKeyValue := servercfg.GetLicenseKey()
-	NetmakerTenantID := servercfg.GetNetmakerTenantID()
+	netmakerTenantID := servercfg.GetNetmakerTenantID()
 	logger.Log(0, "proceeding with Netmaker license validation...")
 	logger.Log(0, "proceeding with Netmaker license validation...")
-	if len(licenseKeyValue) == 0 || len(NetmakerTenantID) == 0 {
+	if len(licenseKeyValue) == 0 || len(netmakerTenantID) == 0 {
 		logger.FatalLog0(errValidation.Error())
 		logger.FatalLog0(errValidation.Error())
 	}
 	}
 
 
@@ -65,7 +65,7 @@ func ValidateLicense() error {
 	}
 	}
 
 
 	licenseSecret := LicenseSecret{
 	licenseSecret := LicenseSecret{
-		AssociatedID: NetmakerTenantID,
+		AssociatedID: netmakerTenantID,
 		Limits:       getCurrentServerLimit(),
 		Limits:       getCurrentServerLimit(),
 	}
 	}
 
 

+ 4 - 4
servercfg/serverconf.go

@@ -672,11 +672,11 @@ func GetLicenseKey() string {
 
 
 // GetNetmakerTenantID - get's the associated, Netmaker, tenant ID to verify ownership
 // GetNetmakerTenantID - get's the associated, Netmaker, tenant ID to verify ownership
 func GetNetmakerTenantID() string {
 func GetNetmakerTenantID() string {
-	NetmakerTenantID := os.Getenv("NETMAKER_TENANT_ID")
-	if NetmakerTenantID == "" {
-		NetmakerTenantID = config.Config.Server.NetmakerTenantID
+	netmakerTenantID := os.Getenv("NETMAKER_TENANT_ID")
+	if netmakerTenantID == "" {
+		netmakerTenantID = config.Config.Server.NetmakerTenantID
 	}
 	}
-	return NetmakerTenantID
+	return netmakerTenantID
 }
 }
 
 
 // GetStunPort - Get the port to run the stun server on
 // GetStunPort - Get the port to run the stun server on