rate limit bucket is global

2 files changed, 10 insertions, 2 deletions

diff --git a/fileio.go b/fileio.go
index e3d9cc1..4ed1867 100644
--- a/fileio.go
+++ b/fileio.go
@@ -16,6 +16,10 @@ import (
 	"github.com/juju/ratelimit"
 )
 
+var (
+	rlBu *ratelimit.Bucket
+)
+
 func (r *wfmRequest) dispFile() {
 	fp := r.uDir + "/" + r.uFbn
 	s := strings.Split(fp, ".")
@@ -99,7 +103,7 @@ func streamFile(w http.ResponseWriter, uFilePath string) {
 
 	var r io.Reader = fi
 	if *rateLim != 0 {
-		r = ratelimit.Reader(fi, ratelimit.NewBucketWithRate(float64(*rateLim<<20), 1<<10))
+		r = ratelimit.Reader(fi, rlBu)
 	}
 
 	_, err = io.Copy(w, r)
@@ -124,7 +128,7 @@ func (r *wfmRequest) uploadFile(h *multipart.FileHeader, f multipart.File) {
 
 	var w io.Writer = fi
 	if *rateLim != 0 {
-		w = ratelimit.Writer(fi, ratelimit.NewBucketWithRate(float64(*rateLim<<20), 1<<10))
+		w = ratelimit.Writer(fi, rlBu)
 	}
 
 	oSize, err := io.Copy(w, f)
diff --git a/wfm.go b/wfm.go
index 0421b14..d305d13 100644
--- a/wfm.go
+++ b/wfm.go
@@ -15,6 +15,7 @@ import (
 	"syscall"
 
 	_ "github.com/breml/rootcerts"
+	"github.com/juju/ratelimit"
 	"golang.org/x/crypto/acme/autocert"
 )
 
@@ -157,6 +158,9 @@ func main() {
 	}
 	log.Printf("Setuid UID=%d GID=%d", os.Geteuid(), os.Getgid())
 
+	// rate limit setup
+	rlBu = ratelimit.NewBucketWithRate(float64(*rateLim<<20), 1<<10)
+
 	// http stuff
 	mux := http.NewServeMux()
 	mux.HandleFunc(*wfmPfx, wfmMain)