Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ type mailRelayConfig struct {
AllowedHosts []string `json:"allowed_hosts"`
AllowedSenders string `json:"allowed_senders"`
TimeoutSecs int `json:"timeout_secs"`
LogLevel string `json:"log_level"`
}

func main() {
Expand All @@ -69,7 +70,7 @@ func run() error {
return err
}

if err := setupLogger(verbose); err != nil {
if err := setupLogger(verbose, appConfig.LogLevel); err != nil {
return err
}

Expand Down Expand Up @@ -137,8 +138,7 @@ func setupIPFilter(appConfig *mailRelayConfig) error {
return nil
}

func setupLogger(verbose bool) error {
logLevel := "info"
func setupLogger(verbose bool, logLevel string) error {
if verbose {
logLevel = "debug"
}
Comment thread
wiggin77 marked this conversation as resolved.
Expand Down Expand Up @@ -213,6 +213,7 @@ func configDefaults(config *mailRelayConfig) {
config.AllowedHosts = []string{"*"}
config.AllowedSenders = "*"
config.TimeoutSecs = DefaultTimeoutSecs
config.LogLevel = "info"
}

// validateConfig validates the configuration values.
Expand Down
2 changes: 1 addition & 1 deletion server.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const (
func Start(appConfig *mailRelayConfig, verbose bool) (err error) {
listen := fmt.Sprintf("%s:%d", appConfig.LocalListenIP, appConfig.LocalListenPort)

logLevel := "info"
logLevel := appConfig.LogLevel
if verbose {
logLevel = "debug"
}
Expand Down
5 changes: 3 additions & 2 deletions testdata/valid.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
"local_listen_port": 2525,
"allowed_hosts": ["test.com", "example.com"],
"allowed_senders": "*",
"timeout_secs": 60
}
"timeout_secs": 60,
"log_level": "error"
}
Loading