Skip to content

Use default db port if one is not specified. #85

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

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

Use default db port if one is not specified. #85

Show file tree
Hide file tree
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
18 changes: 8 additions & 10 deletions cmd/smd-init/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,21 +96,19 @@ func parseCmdLine() {
if dbPortStr == "" {
if val := os.Getenv(envvar); val != "" {
dbPortStr = val
} else {
dbPortStr = "5432"
}
}
if dbPortStr == "" {
lg.Printf("Missing DB port number")

port, err := strconv.ParseInt(dbPortStr, 10, 64)
if err != nil {
lg.Printf("Bad dbport '%s': %s", dbPortStr, err)
flag.Usage()
os.Exit(1)
} else {
port, err := strconv.ParseInt(dbPortStr, 10, 64)
if err != nil {
lg.Printf("Bad dbport '%s': %s", dbPortStr, err)
flag.Usage()
os.Exit(1)
}
dbPort = int(port)
}
dbPort = int(port)

envvar = "SMD_DBOPTS"
if dbOpts == "" {
if val := os.Getenv(envvar); val != "" {
Expand Down
17 changes: 7 additions & 10 deletions cmd/smd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,8 @@ func (s *SmD) parseCmdLine() {
if s.dbPortStr == "" {
if val := os.Getenv(envvar); val != "" {
s.dbPortStr = val
} else {
s.dbPortStr = "5432"
}
}
envvar = "SMD_JWKS_URL"
Expand All @@ -662,19 +664,14 @@ func (s *SmD) parseCmdLine() {
}
}

if s.dbPortStr == "" {
fmt.Printf("Missing DB port number")
port, err := strconv.ParseInt(s.dbPortStr, 10, 64)
if err != nil {
fmt.Printf("Bad dbport '%s': %s", s.dbPortStr, err)
flag.Usage()
os.Exit(1)
} else {
port, err := strconv.ParseInt(s.dbPortStr, 10, 64)
if err != nil {
fmt.Printf("Bad dbport '%s': %s", s.dbPortStr, err)
flag.Usage()
os.Exit(1)
}
s.dbPort = int(port)
}
s.dbPort = int(port)

envvar = "SMD_DBOPTS"
if s.dbOpts == "" {
if val := os.Getenv(envvar); val != "" {
Expand Down
Loading