Ver código fonte

Remove clients and hosts limit from code

gabrielseibel1 2 anos atrás
pai
commit
b5e6fbe1dc
3 arquivos alterados com 0 adições e 30 exclusões
  1. 0 2
      config/config.go
  2. 0 6
      logic/serverconf.go
  3. 0 22
      servercfg/serverconf.go

+ 0 - 2
config/config.go

@@ -82,9 +82,7 @@ type ServerConfig struct {
 	TurnPassword               string `yaml:"turn_password"`
 	UseTurn                    bool   `yaml:"use_turn"`
 	UsersLimit                 int    `yaml:"user_limit"`
-	ClientsLimit               int    `yaml:"client_limit"`
 	NetworksLimit              int    `yaml:"network_limit"`
-	HostsLimit                 int    `yaml:"host_limit"`
 	MachinesLimit              int    `yaml:"machines_limit"`
 	IngressesLimit             int    `yaml:"ingresses_limit"`
 	EgressesLimit              int    `yaml:"egresses_limit"`

+ 0 - 6
logic/serverconf.go

@@ -13,10 +13,6 @@ var (
 	UsersLimit = 1000000000
 	// MachinesLimit - dummy var for community
 	MachinesLimit = 1000000000
-	// ClientsLimit - dummy var for community
-	ClientsLimit = 1000000000
-	// HostsLimit - dummy var for community
-	HostsLimit = 1000000000
 	// IngressesLimit - dummy var for community
 	IngressesLimit = 1000000000
 	// EgressesLimit - dummy var for community
@@ -96,9 +92,7 @@ func StoreJWTSecret(privateKey string) error {
 func SetFreeTierLimits() {
 	FreeTier = true
 	UsersLimit = servercfg.GetUserLimit()
-	ClientsLimit = servercfg.GetClientLimit()
 	NetworksLimit = servercfg.GetNetworkLimit()
-	HostsLimit = servercfg.GetHostLimit()
 	MachinesLimit = servercfg.GetMachinesLimit()
 	IngressesLimit = servercfg.GetIngressLimit()
 	EgressesLimit = servercfg.GetEgressLimit()

+ 0 - 22
servercfg/serverconf.go

@@ -753,28 +753,6 @@ func GetNetworkLimit() int {
 	return networkslimit
 }
 
-// GetClientLimit - fetches free tier limits on ext. clients
-func GetClientLimit() int {
-	var clientsLimit int
-	if os.Getenv("CLIENTS_LIMIT") != "" {
-		clientsLimit, _ = strconv.Atoi(os.Getenv("CLIENTS_LIMIT"))
-	} else {
-		clientsLimit = config.Config.Server.ClientsLimit
-	}
-	return clientsLimit
-}
-
-// GetHostLimit - fetches free tier limits on hosts
-func GetHostLimit() int {
-	var hostsLimit int
-	if os.Getenv("HOSTS_LIMIT") != "" {
-		hostsLimit, _ = strconv.Atoi(os.Getenv("HOSTS_LIMIT"))
-	} else {
-		hostsLimit = config.Config.Server.HostsLimit
-	}
-	return hostsLimit
-}
-
 // GetMachinesLimit - fetches free tier limits on machines (clients + hosts)
 func GetMachinesLimit() int {
 	if l, err := strconv.Atoi(os.Getenv("MACHINES_LIMIT")); err == nil {