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

whoops

master
Bel LaPointe 2019-02-23 19:04:12 -07:00
parent 2099ae50c6
commit 3961623373
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.go
View File

@ -2,7 +2,6 @@ package config
import ( import (
"local/rproxy3/storage/packable" "local/rproxy3/storage/packable"
"log"
"strconv" "strconv"
"strings" "strings"
) )
@ -72,7 +71,6 @@ func GetTimeout() int {
conf.Get(nsConf, flagTimeout, t) conf.Get(nsConf, flagTimeout, t)
timeout, _ := strconv.Atoi(t.String()) timeout, _ := strconv.Atoi(t.String())
log.Printf("TIMEOUT t:%q, i:%v", t.String(), timeout)
return timeout return timeout
} }

1
config/new.go
View File

@ -119,7 +119,6 @@ func fromFlags() error {
for _, bind := range binds { for _, bind := range binds {
confFlag := flag.Lookup(bind.flag) confFlag := flag.Lookup(bind.flag)
log.Printf("flag:%v", confFlag)
if confFlag == nil || confFlag.Value.String() == "" { if confFlag == nil || confFlag.Value.String() == "" {
continue continue
} }

1
server/server.go
View File

@ -87,7 +87,6 @@ func (s *Server) doAuth(foo http.HandlerFunc) http.HandlerFunc {
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.Second*time.Duration(config.GetTimeout()))
log.Printf("context iwth tiemout: %v", time.Second*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)

12
vendor/vendor.json vendored
View File

@ -2,6 +2,18 @@
"comment": "", "comment": "",
"ignore": "test", "ignore": "test",
"package": [ "package": [
{
"checksumSHA1": "GtamqiJoL7PGHsN454AoffBFMa8=",
"path": "golang.org/x/net/context",
"revision": "65e2d4e15006aab9813ff8769e768bbf4bb667a0",
"revisionTime": "2019-02-01T23:59:58Z"
},
{
"checksumSHA1": "HoCvrd3hEhsFeBOdEw7cbcfyk50=",
"path": "golang.org/x/time/rate",
"revision": "fbb02b2291d28baffd63558aa44b4b56f178d650",
"revisionTime": "2018-04-12T16:56:04Z"
},
{ {
"checksumSHA1": "QqDq2x8XOU7IoOR98Cx1eiV5QY8=", "checksumSHA1": "QqDq2x8XOU7IoOR98Cx1eiV5QY8=",
"path": "gopkg.in/yaml.v2", "path": "gopkg.in/yaml.v2",