some tests and major cleanup

This commit is contained in:
ston1th 2018-10-19 23:08:32 +02:00
commit 16671b3406
30 changed files with 192057 additions and 202431 deletions

View file

@ -5,6 +5,7 @@ package server
import (
"bytes"
"context"
"errors"
"git.giftfish.de/ston1th/gowiki/pkg/core"
"git.giftfish.de/ston1th/gowiki/pkg/db"
"git.giftfish.de/ston1th/gowiki/pkg/log"
@ -54,7 +55,7 @@ func NewHTTPServer(l net.Listener, conf core.Config) (srv *HTTPServer) {
func (s *HTTPServer) Start() (err error) {
s.DB, err = db.New(s.DataDir)
if err != nil {
return
return errors.New("db: " + err.Error())
}
if s.Secret != "" {
s.JWT, err = jwt.New(jwt.DefaultExpiry, s.DB, bytes.NewBufferString(s.Secret))
@ -62,7 +63,7 @@ func (s *HTTPServer) Start() (err error) {
s.JWT, err = jwt.New(jwt.DefaultExpiry, s.DB, nil)
}
if err != nil {
return
return errors.New("server: " + err.Error())
}
go func() {
log.Println(s.srv.Serve(s.listener))