From 3ad49a082c1e4380fba68e369c826a2810096e7c Mon Sep 17 00:00:00 2001 From: Ryan Cavicchioni Date: Mon, 26 Jul 2021 19:47:29 -0500 Subject: [PATCH] Make database path more dynamic --- cmd/main.go | 22 +++++++++++++++++++++- internal/haberdasherserver/server.go | 8 +++++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index d1b30db..297f796 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -1,19 +1,39 @@ package main import ( + "fmt" "net/http" "os" + "path" "haberdasher-twirp/haberdasher" "haberdasher-twirp/internal/haberdasherserver" ) func main() { + var cwd, dbPath, dbDir string + var err error + var bind string = ":8080" + + cwd, err = os.Getwd() + dbPath = path.Join(cwd, "var/hat.db") + dbDir = path.Dir(dbPath) + + if _, err = os.Stat(dbDir); os.IsNotExist(err) { + err = os.Mkdir(dbDir, 0700) + if err != nil { + fmt.Printf("boltdb: %s\n", err) + } + } + if len(os.Args) > 1 { bind = os.Args[1] } - server := &haberdasherserver.Server{} + + fmt.Printf("boltdb: %s\n", dbPath) + + server := &haberdasherserver.Server{DBPath: dbPath} twirpHandler := haberdasher.NewHaberdasherServer(server) http.ListenAndServe(bind, twirpHandler) diff --git a/internal/haberdasherserver/server.go b/internal/haberdasherserver/server.go index 49fcc47..e675b5a 100644 --- a/internal/haberdasherserver/server.go +++ b/internal/haberdasherserver/server.go @@ -16,7 +16,9 @@ import ( const dbBucket = "hats" -type Server struct{} +type Server struct { + DBPath string +} type Hat struct { Inches int32 `json:"inchues"` @@ -64,7 +66,7 @@ func HatQueryToHatQueryModel(q *pb.HatQuery) HatQuery { } func (s *Server) MakeHat(ctx context.Context, size *pb.Size) (hat *pb.Hat, err error) { - st, _ := NewStore("hat.db", 0600, nil) + st, _ := NewStore(s.DBPath, 0600, nil) defer st.Close() if size.Inches <= 0 { @@ -85,7 +87,7 @@ func (s *Server) MakeHat(ctx context.Context, size *pb.Size) (hat *pb.Hat, err e } func (s *Server) ListHats(ctx context.Context, q *pb.HatQuery) (hats *pb.Hats, err error) { - st, _ := NewStore("hat.db", 0600, nil) + st, _ := NewStore(s.DBPath, 0600, nil) defer st.Close() hs, err := st.ListHats(HatQueryToHatQueryModel(q))