Browse Source

Rename configurators.Hex to configurators.HexSlice and configurators.HexFile to configurators.HexSliceFile

DarthSim 2 years ago
parent
commit
ff3d3cedc4
2 changed files with 6 additions and 6 deletions
  1. 4 4
      config/config.go
  2. 2 2
      config/configurators/configurators.go

+ 4 - 4
config/config.go

@@ -402,18 +402,18 @@ func Configure() error {
 	configurators.Bool(&UseLinearColorspace, "IMGPROXY_USE_LINEAR_COLORSPACE")
 	configurators.Bool(&UseLinearColorspace, "IMGPROXY_USE_LINEAR_COLORSPACE")
 	configurators.Bool(&DisableShrinkOnLoad, "IMGPROXY_DISABLE_SHRINK_ON_LOAD")
 	configurators.Bool(&DisableShrinkOnLoad, "IMGPROXY_DISABLE_SHRINK_ON_LOAD")
 
 
-	if err := configurators.Hex(&Keys, "IMGPROXY_KEY"); err != nil {
+	if err := configurators.HexSlice(&Keys, "IMGPROXY_KEY"); err != nil {
 		return err
 		return err
 	}
 	}
-	if err := configurators.Hex(&Salts, "IMGPROXY_SALT"); err != nil {
+	if err := configurators.HexSlice(&Salts, "IMGPROXY_SALT"); err != nil {
 		return err
 		return err
 	}
 	}
 	configurators.Int(&SignatureSize, "IMGPROXY_SIGNATURE_SIZE")
 	configurators.Int(&SignatureSize, "IMGPROXY_SIGNATURE_SIZE")
 
 
-	if err := configurators.HexFile(&Keys, keyPath); err != nil {
+	if err := configurators.HexSliceFile(&Keys, keyPath); err != nil {
 		return err
 		return err
 	}
 	}
-	if err := configurators.HexFile(&Salts, saltPath); err != nil {
+	if err := configurators.HexSliceFile(&Salts, saltPath); err != nil {
 		return err
 		return err
 	}
 	}
 
 

+ 2 - 2
config/configurators/configurators.go

@@ -150,7 +150,7 @@ func ImageTypesQuality(m map[imagetype.Type]int, name string) error {
 	return nil
 	return nil
 }
 }
 
 
-func Hex(b *[][]byte, name string) error {
+func HexSlice(b *[][]byte, name string) error {
 	var err error
 	var err error
 
 
 	if env := os.Getenv(name); len(env) > 0 {
 	if env := os.Getenv(name); len(env) > 0 {
@@ -170,7 +170,7 @@ func Hex(b *[][]byte, name string) error {
 	return nil
 	return nil
 }
 }
 
 
-func HexFile(b *[][]byte, filepath string) error {
+func HexSliceFile(b *[][]byte, filepath string) error {
 	if len(filepath) == 0 {
 	if len(filepath) == 0 {
 		return nil
 		return nil
 	}
 	}