Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add an --env flag to specify which env files to load #145

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add an --env flag to specify which env files to load #145

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ var exitOnStop = flag.Bool("exit-on-stop", true, "Exit goreman if all subprocess
// show timestamp in log
var logTime = flag.Bool("logtime", true, "show timestamp in log")

var envFileOption = flag.String("env", ".env", "Environment files to load, comma separated")

var maxProcNameLength = 0

var re = regexp.MustCompile(`\$([a-zA-Z]+[a-zA-Z0-9_]+)`)
Expand All @@ -109,6 +111,7 @@ type config struct {
BaseDir string `yaml:"basedir"`
BasePort uint `yaml:"baseport"`
Args []string
EnvFiles []string
// If true, exit the supervisor process if a subprocess exits with an error.
ExitOnError bool `yaml:"exit_on_error"`
}
Expand All @@ -125,6 +128,7 @@ func readConfig() *config {
cfg.Port = *port
cfg.BaseDir = *basedir
cfg.BasePort = *baseport
cfg.EnvFiles = strings.FieldsFunc(*envFileOption, func(char rune) bool { return char == ',' })
cfg.ExitOnError = *exitOnError
cfg.Args = flag.Args()

Expand Down Expand Up @@ -263,7 +267,9 @@ func start(ctx context.Context, sig <-chan os.Signal, cfg *config) error {
procs = tmp
mu.Unlock()
}
godotenv.Load()
if len(cfg.EnvFiles) > 0 {
godotenv.Load(cfg.EnvFiles...)
}
rpcChan := make(chan *rpcMessage, 10)
if *startRPCServer {
go startServer(ctx, rpcChan, cfg.Port)
Expand Down