ston1th/gowiki
0
0
Fork 0
Code Issues 2 Releases Activity

first working version

Browse source
This commit is contained in:
ston1th 2018-09-14 00:14:49 +02:00
commit 85f93bae69
32 changed files with 863 additions and 571 deletions
Download patch file Download diff file Expand all files Collapse all files

21
pkg/cmd/cmd.go
View file

@ -13,7 +13,6 @@ import (
"syscall"
"time"
"git.giftfish.de/ston1th/gowiki/pkg/db"
"git.giftfish.de/ston1th/gowiki/pkg/log"
"git.giftfish.de/ston1th/gowiki/pkg/server"
)
@ -29,7 +28,7 @@ const (
defRunGroup = "wiki"
)
func server(conf serverConfig) (err error) {
func initServer(conf serverConfig) (err error) {
dropCfg := godrop.Config{
User: conf.User,
Group: conf.Group,
@ -52,7 +51,7 @@ func server(conf serverConfig) (err error) {
return
}
srv := server.NewHTTPServer(l, conf.Version, conf.SecureCookie)
srv := server.NewHTTPServer(l, conf.Version, conf.DataDir+"/"+blevePath, conf.SecureCookie)
err = srv.Start()
if err != nil {
return
@ -92,7 +91,7 @@ func Run(version string) {
Flags: defaultFlags(serverFlags()),
Action: func(c *cli.Context) error {
conf.Version = app.Version
if err := server(conf); err != nil {
if err := initServer(conf); err != nil {
stdlog.Fatal("server: ", err)
}
return nil
@ -106,9 +105,10 @@ func Run(version string) {
if err := os.Chdir(conf.DataDir); err != nil {
stdlog.Fatal("dump: ", err)
}
if err := db.Dump(blevePath, verbose); err != nil {
stdlog.Fatal("dump: ", err)
}
//TODO
//if err := db.Dump(blevePath, verbose); err != nil {
// stdlog.Fatal("dump: ", err)
//}
return nil
},
},
@ -120,9 +120,10 @@ func Run(version string) {
if err := os.Chdir(conf.DataDir); err != nil {
stdlog.Fatal("restore: ", err)
}
if err := db.Restore(blevePath, verbose); err != nil {
stdlog.Fatal("restore: ", err)
}
//TODO
//if err := db.Restore(blevePath, verbose); err != nil {
// stdlog.Fatal("restore: ", err)
//}
return nil
},
},