mirror of
https://github.com/nkanaev/yarr.git
synced 2025-05-24 00:33:14 +00:00
db parameter
This commit is contained in:
parent
1d977c543a
commit
65ddfc297d
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@
|
|||||||
/gofeed
|
/gofeed
|
||||||
/_output
|
/_output
|
||||||
/yarr
|
/yarr
|
||||||
|
*.db
|
||||||
|
19
main.go
19
main.go
@ -11,17 +11,24 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
var addr, storageFile string
|
||||||
|
flag.StringVar(&addr, "addr", "127.0.0.1:7070", "address to run server on")
|
||||||
|
flag.StringVar(&storageFile, "db", "", "storage file path")
|
||||||
|
flag.Parse()
|
||||||
|
|
||||||
logger := log.New(os.Stdout, "", log.Ldate|log.Ltime|log.Lshortfile)
|
logger := log.New(os.Stdout, "", log.Ldate|log.Ltime|log.Lshortfile)
|
||||||
|
|
||||||
configPath, err := os.UserConfigDir()
|
configPath, err := os.UserConfigDir()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Fatal("Failed to get config dir: ", err)
|
logger.Fatal("Failed to get config dir: ", err)
|
||||||
}
|
}
|
||||||
storagePath := filepath.Join(configPath, "yarr")
|
|
||||||
storageFile := filepath.Join(storagePath, "storage.db")
|
|
||||||
|
|
||||||
if err := os.MkdirAll(storagePath, 0755); err != nil {
|
if storageFile == "" {
|
||||||
logger.Fatal("Failed to create app config dir: ", err)
|
storagePath := filepath.Join(configPath, "yarr")
|
||||||
|
if err := os.MkdirAll(storagePath, 0755); err != nil {
|
||||||
|
logger.Fatal("Failed to create app config dir: ", err)
|
||||||
|
}
|
||||||
|
storageFile = filepath.Join(storagePath, "storage.db")
|
||||||
}
|
}
|
||||||
|
|
||||||
db, err := storage.New(storageFile, logger)
|
db, err := storage.New(storageFile, logger)
|
||||||
@ -29,10 +36,6 @@ func main() {
|
|||||||
logger.Fatal("Failed to initialise database: ", err)
|
logger.Fatal("Failed to initialise database: ", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
var addr string
|
|
||||||
flag.StringVar(&addr, "addr", "127.0.0.1:7070", "address to run server on")
|
|
||||||
flag.Parse()
|
|
||||||
|
|
||||||
srv := server.New(db, logger, addr)
|
srv := server.New(db, logger, addr)
|
||||||
platform.Start(srv)
|
platform.Start(srv)
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,7 @@ func (h *Handler) Start() {
|
|||||||
h.startJobs()
|
h.startJobs()
|
||||||
s := &http.Server{Addr: h.Addr, Handler: h}
|
s := &http.Server{Addr: h.Addr, Handler: h}
|
||||||
s.ListenAndServe()
|
s.ListenAndServe()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h Handler) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
|
func (h Handler) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
|
||||||
route, vars := getRoute(req)
|
route, vars := getRoute(req)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user