sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-13 08:59:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into fix_debug_upload_url_from_mgmt

Browse Source 
# Conflicts:
#	client/proto/daemon.pb.go
#	management/internals/controllers/network_map/controller/controller.go
#	management/internals/controllers/network_map/nmaptest/runner.go
#	management/internals/shared/grpc/server.go
#	management/server/account.go
#	shared/management/proto/management.pb.go
#	upload-server/server/server.go
This commit is contained in:
riccardom
2026-10-09 11:13:57 +02:00
parent 8074614e89 3e85e40be2
commit 296bdc2849
518 changed files with 30626 additions and 12765 deletions
Download Patch File Download Diff File Expand all files Collapse all files
upload-server/server/server.go
+3 -3
View File
@@ -10,7 +10,7 @@ import (
"github.com/google/uuid"
log "github.com/sirupsen/logrus"
"github.com/netbirdio/netbird/management/server/http/middleware"
"github.com/netbirdio/netbird/shared/ratelimit"
"github.com/netbirdio/netbird/upload-server/types"
)
@@ -35,7 +35,7 @@ const (
type Server struct {
srv *http.Server
limiter *middleware.APIRateLimiter
limiter *ratelimit.APIRateLimiter
certFile string
keyFile string
}
@@ -104,7 +104,7 @@ func (s *Server) Stop() error {
return nil
}
func configureMux(mux *http.ServeMux) (*middleware.APIRateLimiter, error) {
func configureMux(mux *http.ServeMux) (*ratelimit.APIRateLimiter, error) {
limiter := newRateLimiter()
_, ok := os.LookupEnv(bucketVar)