highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-09-27 12:07:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed redaundant LocalEnaled

Browse Source
This commit is contained in:
Viktor Sokolov
2025-09-05 03:25:46 +02:00
parent f33470fea0
commit a71b36b245
2 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
transport/config.go
View File

@@ -16,8 +16,7 @@ import (
type Config struct { type Config struct {
HTTP *generichttp.Config HTTP *generichttp.Config
LocalEnabled bool Local *fs.Config
Local *fs.Config
ABSEnabled bool ABSEnabled bool
ABS *azure.Config ABS *azure.Config
@@ -36,7 +35,6 @@ type Config struct {
func NewDefaultConfig() *Config { func NewDefaultConfig() *Config {
return &Config{ return &Config{
HTTP: generichttp.NewDefaultConfig(), HTTP: generichttp.NewDefaultConfig(),
LocalEnabled: false,
Local: fs.NewDefaultConfig(), Local: fs.NewDefaultConfig(),
ABSEnabled: false, ABSEnabled: false,
ABS: azure.NewDefaultConfig(), ABS: azure.NewDefaultConfig(),
@@ -77,7 +75,6 @@ func LoadFromEnv(c *Config) (*Config, error) {
return nil, err return nil, err
} }
c.LocalEnabled = config.LocalFileSystemRoot != ""
c.ABSEnabled = config.ABSEnabled c.ABSEnabled = config.ABSEnabled
c.GCSEnabled = config.GCSEnabled c.GCSEnabled = config.GCSEnabled
c.S3Enabled = config.S3Enabled c.S3Enabled = config.S3Enabled

32
transport/transport.go
View File

@@ -16,10 +16,9 @@ import (
// Transport is a wrapper around http.Transport which allows to track registered protocols // Transport is a wrapper around http.Transport which allows to track registered protocols
type Transport struct { type Transport struct {
config *Config config *Config
transport *http.Transport transport *http.Transport
upstreamTransport *http.Transport schemes map[string]struct{}
schemes map[string]struct{}
} }
// New creates a new HTTP transport with no protocols registered // New creates a new HTTP transport with no protocols registered
@@ -33,11 +32,6 @@ func New(config *Config) (*Transport, error) {
return nil, err return nil, err
} }
upstreamTransport, err := generichttp.New(false, config.HTTP)
if err != nil {
return nil, err
}
// http and https are always registered // http and https are always registered
schemes := map[string]struct{}{ schemes := map[string]struct{}{
"http": {}, "http": {},
@@ -45,10 +39,9 @@ func New(config *Config) (*Transport, error) {
} }
t := &Transport{ t := &Transport{
config: config, config: config,
transport: transport, transport: transport,
upstreamTransport: upstreamTransport, schemes: schemes,
schemes: schemes,
} }
err = t.registerAllProtocols() err = t.registerAllProtocols()
@@ -78,12 +71,17 @@ func (t *Transport) IsProtocolRegistered(scheme string) bool {
// RegisterAllProtocols registers all enabled protocols in the given transport // RegisterAllProtocols registers all enabled protocols in the given transport
func (t *Transport) registerAllProtocols() error { func (t *Transport) registerAllProtocols() error {
transp, err := generichttp.New(false, t.config.HTTP)
if err != nil {
return err
}
if t.config.Local.Root != "" { if t.config.Local.Root != "" {
t.RegisterProtocol("local", fsTransport.New(t.config.Local)) t.RegisterProtocol("local", fsTransport.New(t.config.Local))
} }
if t.config.S3Enabled { if t.config.S3Enabled {
if tr, err := s3Transport.New(t.config.S3, t.upstreamTransport); err != nil { if tr, err := s3Transport.New(t.config.S3, transp); err != nil {
return err return err
} else { } else {
t.RegisterProtocol("s3", tr) t.RegisterProtocol("s3", tr)
@@ -91,7 +89,7 @@ func (t *Transport) registerAllProtocols() error {
} }
if t.config.GCSEnabled { if t.config.GCSEnabled {
if tr, err := gcsTransport.New(t.config.GCS, t.upstreamTransport); err != nil { if tr, err := gcsTransport.New(t.config.GCS, transp); err != nil {
return err return err
} else { } else {
t.RegisterProtocol("gs", tr) t.RegisterProtocol("gs", tr)
@@ -99,7 +97,7 @@ func (t *Transport) registerAllProtocols() error {
} }
if t.config.ABSEnabled { if t.config.ABSEnabled {
if tr, err := azureTransport.New(t.config.ABS, t.upstreamTransport); err != nil { if tr, err := azureTransport.New(t.config.ABS, transp); err != nil {
return err return err
} else { } else {
t.RegisterProtocol("abs", tr) t.RegisterProtocol("abs", tr)
@@ -107,7 +105,7 @@ func (t *Transport) registerAllProtocols() error {
} }
if t.config.SwiftEnabled { if t.config.SwiftEnabled {
if tr, err := swiftTransport.New(t.config.Swift, t.upstreamTransport); err != nil { if tr, err := swiftTransport.New(t.config.Swift, transp); err != nil {
return err return err
} else { } else {
t.RegisterProtocol("swift", tr) t.RegisterProtocol("swift", tr)