1
0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-09-16 09:36:18 +02:00

Get rid of init() in config.go

This commit is contained in:
DarthSim
2019-06-06 19:26:00 +06:00
parent fa224981af
commit 3ae859162f
3 changed files with 21 additions and 9 deletions

View File

@@ -231,9 +231,7 @@ var conf = config{
BufferPoolCalibrationThreshold: 1024, BufferPoolCalibrationThreshold: 1024,
} }
func init() { func configure() {
initSyslog()
keyPath := flag.String("keypath", "", "path of the file with hex-encoded key") keyPath := flag.String("keypath", "", "path of the file with hex-encoded key")
saltPath := flag.String("saltpath", "", "path of the file with hex-encoded salt") saltPath := flag.String("saltpath", "", "path of the file with hex-encoded salt")
presetsPath := flag.String("presets", "", "path of the file with presets") presetsPath := flag.String("presets", "", "path of the file with presets")
@@ -463,10 +461,4 @@ func init() {
if conf.BufferPoolCalibrationThreshold < 64 { if conf.BufferPoolCalibrationThreshold < 64 {
logFatal("Buffer pool calibration threshold should be greater than or equal to 64") logFatal("Buffer pool calibration threshold should be greater than or equal to 64")
} }
initNewrelic()
initPrometheus()
initDownloading()
initErrorsReporting()
initVips()
} }

12
main.go
View File

@@ -16,7 +16,19 @@ const version = "2.2.13"
type ctxKey string type ctxKey string
func initialize() {
initSyslog()
configure()
initNewrelic()
initPrometheus()
initDownloading()
initErrorsReporting()
initVips()
}
func main() { func main() {
initialize()
go func() { go func() {
var logMemStats = len(os.Getenv("IMGPROXY_LOG_MEM_STATS")) > 0 var logMemStats = len(os.Getenv("IMGPROXY_LOG_MEM_STATS")) > 0

View File

@@ -1,6 +1,9 @@
package main package main
import ( import (
"os"
"testing"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
) )
@@ -10,6 +13,11 @@ type MainTestSuite struct {
oldConf config oldConf config
} }
func TestMain(m *testing.M) {
initialize()
os.Exit(m.Run())
}
func (s *MainTestSuite) SetupTest() { func (s *MainTestSuite) SetupTest() {
s.oldConf = conf s.oldConf = conf
} }