Skip to content

Commit

Permalink
Make the config file path a flag until we get rid of all the flags
Browse files Browse the repository at this point in the history
  • Loading branch information
mortenmj committed Oct 14, 2024
1 parent ef82a19 commit e9b3bae
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions cmd/bb_portal/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import (
_ "github.com/mattn/go-sqlite3"
build "google.golang.org/genproto/googleapis/devtools/build/v1"
go_grpc "google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

"github.com/buildbarn/bb-portal/ent/gen/ent"
"github.com/buildbarn/bb-portal/ent/gen/ent/migrate"
Expand All @@ -34,6 +32,7 @@ const (
)

var (
configFile = flag.String("config-file", "bb_portal.jsonnet", "bb_portal config file")
dsDriver = flag.String("datasource-driver", "sqlite3", "Data source driver to use")
dsURL = flag.String("datasource-url", "file:buildportal.db?_journal=WAL&_fk=1", "Data source URL for the DB")
bepFolder = flag.String("bep-folder", "./bep-files/", "Folder to watch for new BEP files")
Expand All @@ -47,12 +46,8 @@ func main() {
program.RunMain(func(ctx context.Context, siblingsGroup, dependenciesGroup program.Group) error {
flag.Parse()

if len(os.Args) != 2 {
return status.Error(codes.InvalidArgument, "Usage: bb_portal bb_portal.jsonnet")
}

var configuration bb_portal.ApplicationConfiguration
if err := util.UnmarshalConfigurationFromFile(os.Args[1], &configuration); err != nil {
if err := util.UnmarshalConfigurationFromFile(*configFile, &configuration); err != nil {
return util.StatusWrapf(err, "Failed to read configuration from %s", os.Args[1])
}

Expand Down

0 comments on commit e9b3bae

Please sign in to comment.