beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Rename serverIP and serverPort to httpServer*, see #50

Browse source
This commit is contained in:
Michael Mayer 2018-12-21 03:06:48 +01:00
parent 149e9f15d7
commit cde4eb5d92
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
internal/context/config.go
View file

@ -38,8 +38,8 @@ type Config struct {
sqlServerHost string sqlServerHost string
sqlServerPort uint sqlServerPort uint
dbServerPath string dbServerPath string
serverIP string httpServerHost string
serverPort int httpServerPort int
serverMode string serverMode string
assetsPath string assetsPath string
cachePath string cachePath string
@ -94,12 +94,12 @@ func (c *Config) SetValuesFromFile(fileName string) error {
c.dbServerPath = dbServerPath c.dbServerPath = dbServerPath
} }
if serverIP, err := yamlConfig.Get("server-host"); err == nil { if httpServerHost, err := yamlConfig.Get("server-host"); err == nil {
c.serverIP = serverIP c.httpServerHost = httpServerHost
} }
if serverPort, err := yamlConfig.GetInt("server-port"); err == nil { if httpServerPort, err := yamlConfig.GetInt("server-port"); err == nil {
c.serverPort = int(serverPort) c.httpServerPort = int(httpServerPort)
} }
if serverMode, err := yamlConfig.Get("server-mode"); err == nil { if serverMode, err := yamlConfig.Get("server-mode"); err == nil {
@ -192,12 +192,12 @@ func (c *Config) SetValuesFromCliContext(ctx *cli.Context) error {
c.dbServerPath = ctx.String("db-path") c.dbServerPath = ctx.String("db-path")
} }
if ctx.IsSet("server-host") || c.serverIP == "" { if ctx.IsSet("server-host") || c.httpServerHost == "" {
c.serverIP = ctx.String("server-host") c.httpServerHost = ctx.String("server-host")
} }
if ctx.IsSet("server-port") || c.serverPort == 0 { if ctx.IsSet("server-port") || c.httpServerPort == 0 {
c.serverPort = ctx.Int("server-port") c.httpServerPort = ctx.Int("server-port")
} }
if ctx.IsSet("server-mode") || c.serverMode == "" { if ctx.IsSet("server-mode") || c.serverMode == "" {
@ -333,12 +333,12 @@ func (c *Config) SqlServerPort() uint {
// HttpServerHost returns the server host name or IP address (empty for all interfaces). // HttpServerHost returns the server host name or IP address (empty for all interfaces).
func (c *Config) HttpServerHost() string { func (c *Config) HttpServerHost() string {
return c.serverIP return c.httpServerHost
} }
// GetServerPort returns the server port. // GetServerPort returns the server port.
func (c *Config) GetServerPort() int { func (c *Config) GetServerPort() int {
return c.serverPort return c.httpServerPort
} }
// GetServerMode returns the server mode. // GetServerMode returns the server mode.