ryanc/haberdasher-twirp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make database path more dynamic

Browse Source
This commit is contained in:
Ryan Cavicchioni 2021-07-26 19:47:29 -05:00
parent fbeb439bc0
commit 3ad49a082c
Signed by: ryanc
GPG Key ID: 877EEDAF9245103D
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/main.go
View File

@ -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)

8
internal/haberdasherserver/server.go
View File

@ -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))