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

work in progress

Browse source
This commit is contained in:
ston1th 2018-09-04 23:15:47 +02:00
commit 07ff5ccffb
23 changed files with 228 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

22
pkg/cmd/cmd.go
View file

@ -1,19 +1,21 @@
// Copyright (C) 2017 Marius Schellenberger
package main
package cmd
import (
"errors"
"git.giftfish.de/ston1th/godrop"
"github.com/urfave/cli"
logger "log"
stdlog "log"
"net"
"os"
"os/signal"
"syscall"
"time"
"git.giftfish.de/ston1th/gowiki/pkg/db"
"git.giftfish.de/ston1th/gowiki/pkg/log"
"git.giftfish.de/ston1th/gowiki/pkg/server"
)
const (
@ -50,7 +52,7 @@ func server(conf serverConfig) (err error) {
return
}
srv := NewHTTPServer(l, conf.Version, conf.SecureCookie)
srv := server.NewHTTPServer(l, conf.Version, conf.SecureCookie)
err = srv.Start()
if err != nil {
return
@ -91,7 +93,7 @@ func Run(version string) {
Action: func(c *cli.Context) error {
conf.Version = app.Version
if err := server(conf); err != nil {
logger.Fatal("server: ", err)
stdlog.Fatal("server: ", err)
}
return nil
},
@ -102,10 +104,10 @@ func Run(version string) {
Flags: defaultFlags(dumpRestoreFlags()),
Action: func(c *cli.Context) error {
if err := os.Chdir(conf.DataDir); err != nil {
logger.Fatal("dump: ", err)
stdlog.Fatal("dump: ", err)
}
if err := dump(blevePath, verbose); err != nil {
logger.Fatal("dump: ", err)
if err := db.Dump(blevePath, verbose); err != nil {
stdlog.Fatal("dump: ", err)
}
return nil
},
@ -116,10 +118,10 @@ func Run(version string) {
Flags: defaultFlags(dumpRestoreFlags()),
Action: func(c *cli.Context) error {
if err := os.Chdir(conf.DataDir); err != nil {
logger.Fatal("restore: ", err)
stdlog.Fatal("restore: ", err)
}
if err := restore(blevePath, verbose); err != nil {
logger.Fatal("restore: ", err)
if err := db.Restore(blevePath, verbose); err != nil {
stdlog.Fatal("restore: ", err)
}
return nil
},