fix traffic limiter

cmd/gost/cmd.go

@@ -37,33 +37,6 @@ func buildConfigFromCmd(services, nodes stringList) (*config.Config, error) {
 	namePrefix := ""
 	cfg := &config.Config{}
 
-	if v := os.Getenv("GOST_PROFILING"); v != "" {
-		cfg.Profiling = &config.ProfilingConfig{
-			Addr: v,
-		}
-	}
-	if v := os.Getenv("GOST_METRICS"); v != "" {
-		cfg.Metrics = &config.MetricsConfig{
-			Addr: v,
-		}
-	}
-
-	if v := os.Getenv("GOST_LOGGER_LEVEL"); v != "" {
-		cfg.Log = &config.LogConfig{
-			Level: v,
-		}
-	}
-
-	if v := os.Getenv("GOST_API"); v != "" {
-		cfg.API = &config.APIConfig{
-			Addr: v,
-		}
-	}
-
-	if v := os.Getenv("_GOST_ID"); v != "" {
-		namePrefix = fmt.Sprintf("go-%s@", v)
-	}
-
 	var chain *config.ChainConfig
 	if len(nodes) > 0 {
 		chain = &config.ChainConfig{
@@ -286,15 +259,15 @@ func buildConfigFromCmd(services, nodes stringList) (*config.Config, error) {
 		out := mdutil.GetString(md, "limiter.out")
 		cin := mdutil.GetString(md, "limiter.conn.in")
 		cout := mdutil.GetString(md, "limiter.conn.out")
-		if in != "" || cin != "" {
+		if in != "" || cin != "" || out != "" || cout != "" {
 			limiter := &config.LimiterConfig{
 				Name: fmt.Sprintf("%slimiter-%d", namePrefix, len(cfg.Limiters)),
 			}
-			if in != "" {
+			if in != "" || out != "" {
 				limiter.Limits = append(limiter.Limits,
 					fmt.Sprintf("%s %s %s", traffic.GlobalLimitKey, in, out))
 			}
-			if cin != "" {
+			if cin != "" || cout != "" {
 				limiter.Limits = append(limiter.Limits,
 					fmt.Sprintf("%s %s %s", traffic.ConnLimitKey, cin, cout))
 			}

cmd/gost/main.go

@@ -1,17 +1,17 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"net/http"
 	_ "net/http/pprof"
 	"os"
-	"os/signal"
 	"os/exec"
+	"os/signal"
+	"runtime"
 	"strings"
 	"sync"
-	"context"
-	"runtime"
 	"syscall"
 
 	"github.com/go-gost/core/logger"
@@ -39,13 +39,14 @@ func init() {
 
 	if strings.Contains(args, " -- ") {
 		var (
-			wg sync.WaitGroup
+			wg  sync.WaitGroup
 			ret int
 		)
 
 		ctx, cancel := context.WithCancel(context.Background())
+		defer cancel()
 
-		for wid, wargs := range strings.Split(" " + args + " ", " -- ") {
+		for wid, wargs := range strings.Split(" "+args+" ", " -- ") {
 			wg.Add(1)
 			go func(wid int, wargs string) {
 				defer wg.Done()
@@ -117,6 +118,29 @@ func main() {
 		}
 	}
 
+	if v := os.Getenv("GOST_PROFILING"); v != "" {
+		cfg.Profiling = &config.ProfilingConfig{
+			Addr: v,
+		}
+	}
+	if v := os.Getenv("GOST_METRICS"); v != "" {
+		cfg.Metrics = &config.MetricsConfig{
+			Addr: v,
+		}
+	}
+
+	if v := os.Getenv("GOST_LOGGER_LEVEL"); v != "" {
+		cfg.Log = &config.LogConfig{
+			Level: v,
+		}
+	}
+
+	if v := os.Getenv("GOST_API"); v != "" {
+		cfg.API = &config.APIConfig{
+			Addr: v,
+		}
+	}
+
 	if debug {
 		if cfg.Log == nil {
 			cfg.Log = &config.LogConfig{}

cmd/gost/version.go

@@ -1,5 +1,5 @@
 package main
 
 const (
-	version = "3.0.0-rc.1"
+	version = "3.0.0-rc.2"
 )