Skip to content
This repository has been archived by the owner on Apr 19, 2024. It is now read-only.

fixes issue when a config file is not specified #230

Closed
wants to merge 2 commits into from
Closed
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
10 changes: 7 additions & 3 deletions cmd/gubernator-cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"context"
"flag"
"fmt"
"io"
"math/rand"
"os"
"strings"
Expand Down Expand Up @@ -89,9 +90,12 @@ func main() {
cmdLine := strings.Join(os.Args[1:], " ")
logrus.WithContext(ctx).Info("Command line: " + cmdLine)

configFileReader, err := os.Open(configFile)
if err != nil {
return fmt.Errorf("while opening config file: %s", err)
var configFileReader io.Reader
if configFile != "" {
configFileReader, err = os.Open(configFile)
if err != nil {
log.WithError(err).Fatal("while opening config file")
}
}
conf, err := guber.SetupDaemonConfig(log, configFileReader)
if err != nil {
Expand Down
9 changes: 6 additions & 3 deletions cmd/gubernator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,12 @@ func main() {
}

// Read our config from the environment or optional environment config file
configFileReader, err := os.Open(configFile)
if err != nil {
log.WithError(err).Fatal("while opening config file")
var configFileReader io.Reader
if configFile != "" {
configFileReader, err = os.Open(configFile)
if err != nil {
log.WithError(err).Fatal("while opening config file")
}
}
conf, err := gubernator.SetupDaemonConfig(logrus.StandardLogger(), configFileReader)
checkErr(err, "while getting config")
Expand Down
7 changes: 7 additions & 0 deletions config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,10 @@ func TestDefaultInstanceId(t *testing.T) {
require.NoError(t, err)
require.NotEmpty(t, daemonConfig.InstanceID)
}

func TestNoConfigFile(t *testing.T) {
os.Clearenv()
daemonConfig, err := SetupDaemonConfig(logrus.StandardLogger(), nil)
require.NoError(t, err)
require.NotEmpty(t, daemonConfig.InstanceID)
}