local
/
rproxy3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix

master v0.5
bel 2019-11-06 18:07:38 -07:00
parent d98703610d
commit d71b00e067
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.go
View File

@ -2,6 +2,7 @@ package config
import ( import (
"fmt" "fmt"
"log"
"strings" "strings"
"time" "time"
) )
@ -42,6 +43,7 @@ func GetPort() string {
func GetRate() (int, int) { func GetRate() (int, int) {
rate := conf.Get("r").GetInt() rate := conf.Get("r").GetInt()
burst := conf.Get("b").GetInt() burst := conf.Get("b").GetInt()
log.Println("rate/burst:", rate, burst)
return rate, burst return rate, burst
} }

2
server/server.go
View File

@ -164,7 +164,7 @@ func pipe(a, b net.Conn) {
func (s *Server) Pre(foo http.HandlerFunc) http.HandlerFunc { func (s *Server) Pre(foo http.HandlerFunc) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
ctx, can := context.WithTimeout(r.Context(), time.Second*time.Duration(config.GetTimeout())) ctx, can := context.WithTimeout(r.Context(), time.Duration(config.GetTimeout()))
defer can() defer can()
if err := s.limiter.Wait(ctx); err != nil { if err := s.limiter.Wait(ctx); err != nil {
w.WriteHeader(http.StatusTooManyRequests) w.WriteHeader(http.StatusTooManyRequests)