3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-24 06:27:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

atomicutil: use atomicutil.Value wherever possible (#3517)

Browse source 
* atomicutil: use atomicutil.Value wherever possible

* fix test

* fix mux router
This commit is contained in:
Caleb Doxsey 2022-07-28 15:38:38 -06:00 • committed by GitHub
parent 5c14d2c994
commit 0ac7e45a21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 121 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

14
proxy/proxy.go
View file

@ -8,11 +8,11 @@ import (
"context"
"fmt"
"net/http"
"sync/atomic"
"github.com/gorilla/mux"
"github.com/pomerium/pomerium/config"
"github.com/pomerium/pomerium/internal/atomicutil"
"github.com/pomerium/pomerium/internal/httputil"
"github.com/pomerium/pomerium/internal/log"
"github.com/pomerium/pomerium/internal/telemetry/metrics"
@ -51,9 +51,9 @@ func ValidateOptions(o *config.Options) error {
// Proxy stores all the information associated with proxying a request.
type Proxy struct {
state *atomicProxyState
currentOptions *config.AtomicOptions
currentRouter atomic.Value
state *atomicutil.Value[*proxyState]
currentOptions *atomicutil.Value[*config.Options]
currentRouter *atomicutil.Value[*mux.Router]
}
// New takes a Proxy service from options and a validation function.
@ -65,10 +65,10 @@ func New(cfg *config.Config) (*Proxy, error) {
}
p := &Proxy{
state: newAtomicProxyState(state),
state: atomicutil.NewValue(state),
currentOptions: config.NewAtomicOptions(),
currentRouter: atomicutil.NewValue(httputil.NewRouter()),
}
p.currentRouter.Store(httputil.NewRouter())
metrics.AddPolicyCountCallback("pomerium-proxy", func() int64 {
return int64(len(p.currentOptions.Load().GetAllPolicies()))
@ -128,5 +128,5 @@ func (p *Proxy) setHandlers(opts *config.Options) error {
}
func (p *Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
p.currentRouter.Load().(*mux.Router).ServeHTTP(w, r)
p.currentRouter.Load().ServeHTTP(w, r)
}