From e132209cc5e7d83b0984a73f1c829edd018ec944 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 22 Feb 2019 14:08:52 +0800 Subject: [PATCH] - up --- platformapi/limit_access_speed.go | 7 ++++--- platformapi/limit_access_speed_test.go | 8 +++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/platformapi/limit_access_speed.go b/platformapi/limit_access_speed.go index 08b45416..5bf61d0a 100644 --- a/platformapi/limit_access_speed.go +++ b/platformapi/limit_access_speed.go @@ -39,9 +39,10 @@ func (l *Limiter) AccessAPI(apiName string) { if bucket == nil && l.defaultConfig != nil { l.Lock() if bucket = l.limitConfig[apiName]; bucket == nil { - v := l.defaultConfig - bucket = ratelimit.NewBucketWithQuantum(time.Duration(v.TimeGapMilliSecond)*time.Millisecond, int64(v.MaxAccessCount), int64(v.MaxAccessCount)) - l.limitConfig[apiName] = bucket + if v := l.defaultConfig; v != nil { + bucket = ratelimit.NewBucketWithQuantum(time.Duration(v.TimeGapMilliSecond)*time.Millisecond, int64(v.MaxAccessCount), int64(v.MaxAccessCount)) + l.limitConfig[apiName] = bucket + } } l.Unlock() } diff --git a/platformapi/limit_access_speed_test.go b/platformapi/limit_access_speed_test.go index 1f6bf882..56abf2ab 100644 --- a/platformapi/limit_access_speed_test.go +++ b/platformapi/limit_access_speed_test.go @@ -4,8 +4,6 @@ import ( "fmt" "testing" "time" - - "git.rosy.net.cn/baseapi/utils" ) func TestLimitSpeed(t *testing.T) { @@ -27,7 +25,7 @@ func TestLimitSpeed(t *testing.T) { count := 0 for { limiter.AccessAPI("limited1persecond") - fmt.Printf("limited1persecond, time:%s, count:%d\n", utils.GetCurTimeStr(), count) + fmt.Printf("limited1persecond, time:%s, count:%d\n", time.Now().Format("2006-01-02 15:04:05.00000"), count) count++ } }() @@ -35,7 +33,7 @@ func TestLimitSpeed(t *testing.T) { count := 0 for { limiter.AccessAPI("limited10per10second") - fmt.Printf("limited10per10second, time:%s, count:%d\n", utils.GetCurTimeStr(), count) + fmt.Printf("limited10per10second, time:%s, count:%d\n", time.Now().Format("2006-01-02 15:04:05.00000"), count) count++ } }() @@ -43,7 +41,7 @@ func TestLimitSpeed(t *testing.T) { count := 0 for { limiter.AccessAPI("otherAPI") - fmt.Printf("otherAPI, time:%s, count:%d\n", utils.GetCurTimeStr(), count) + fmt.Printf("otherAPI, time:%s, count:%d\n", time.Now().Format("2006-01-02 15:04:05.00000"), count) count++ } }()