feat: validate rate limit

Signed-off-by: Gaius <[email protected]>
dragonflyoss · Jun 16, 2022 · 91e951f · 91e951f
1 parent a7b4b92
commit 91e951f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/client/config/dfget.go b/client/config/dfget.go
@@ -164,7 +164,7 @@ func (cfg *ClientOption) Validate() error {
 	}
 
 	if int64(cfg.RateLimit.Limit) < DefaultMinRate.ToNumber() {
-		return fmt.Errorf("rate limit must be greater than %s", DefaultMinRate.String())
+		return errors.Wrapf(dferrors.ErrInvalidArgument, "rate limit must be greater than %s", DefaultMinRate.String())
 	}
 
 	return nil

diff --git a/client/config/dfget_linux.go b/client/config/dfget_linux.go
@@ -19,7 +19,11 @@
 
 package config
 
-import "d7y.io/dragonfly/v2/client/clientutil"
+import (
+	"golang.org/x/time/rate"
+
+	"d7y.io/dragonfly/v2/client/clientutil"
+)
 
 var dfgetConfig = ClientOption{
 	URL:     "",

diff --git a/client/config/peerhost.go b/client/config/peerhost.go
@@ -42,11 +42,6 @@ import (
 	"d7y.io/dragonfly/v2/pkg/util/net/iputils"
 )
 
-const (
-	// minRateLimit is the minimum of rate limit.
-	minRateLimit = 20 * 1024 * 1024
-)
-
 type DaemonConfig = DaemonOption
 type DaemonOption struct {
 	base.Options `yaml:",inline" mapstructure:",squash"`
@@ -136,11 +131,11 @@ func (p *DaemonOption) Validate() error {
 	}
 
 	if int64(p.Download.TotalRateLimit.Limit) < DefaultMinRate.ToNumber() {
-		return fmt.Errorf("rate limit must be greater than %s", DefaultMinRate.String())
+		return errors.Errorf("rate limit must be greater than %s", DefaultMinRate.String())
 	}
 
 	if int64(p.Upload.RateLimit.Limit) < DefaultMinRate.ToNumber() {
-		return fmt.Errorf("rate limit must be greater than %s", DefaultMinRate.String())
+		return errors.Errorf("rate limit must be greater than %s", DefaultMinRate.String())
 	}
 
 	switch p.Download.DefaultPattern {