Skip to content

Commit 5460a5e

Browse files
author
Karolis Rusenas
committed
Merge pull request #52 from rusenask/feature/settings_fix
returning reference
2 parents 08bbc38 + b3d4741 commit 5460a5e

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

settings.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,17 @@ const DefaultAdminPort = ":8888" // default admin interface port
3737

3838
// initSettings gets and returns initial configuration from env
3939
// variables or sets defaults
40-
func InitSettings() (AppConfig *Configuration) {
40+
func InitSettings() *Configuration {
4141

42+
var appConfig Configuration
4243
// getting default admin interface port
4344
adminPort := os.Getenv("AdminPort")
4445
if adminPort == "" {
4546
adminPort = DefaultAdminPort
4647
} else {
4748
adminPort = fmt.Sprintf(":%s", adminPort)
4849
}
49-
AppConfig.adminInterface = adminPort
50+
appConfig.adminInterface = adminPort
5051

5152
// getting default database
5253
port := os.Getenv("ProxyPort")
@@ -56,16 +57,16 @@ func InitSettings() (AppConfig *Configuration) {
5657
port = fmt.Sprintf(":%s", port)
5758
}
5859

59-
AppConfig.proxyPort = port
60+
appConfig.proxyPort = port
6061

6162
databaseName := os.Getenv("HoverflyDB")
6263
if databaseName == "" {
6364
databaseName = "requests.db"
6465
}
65-
AppConfig.databaseName = databaseName
66+
appConfig.databaseName = databaseName
6667

6768
// middleware configuration
68-
AppConfig.middleware = os.Getenv("HoverflyMiddleware")
69+
appConfig.middleware = os.Getenv("HoverflyMiddleware")
6970

70-
return AppConfig
71+
return &appConfig
7172
}

0 commit comments

Comments
 (0)