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

general improvements

Browse source
This commit is contained in:
ston1th 2018-10-27 21:28:19 +02:00
commit ddb11f0619
25 changed files with 305 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pkg/server/server.go
View file

@ -23,10 +23,7 @@ const (
)
type HTTPServer struct {
Version string
Secure bool
Secret string
DataDir string
Config core.Config
listener net.Listener
srv *http.Server
@ -38,12 +35,9 @@ type HTTPServer struct {
res map[string][]byte
}
func NewHTTPServer(l net.Listener, conf core.Config) (srv *HTTPServer) {
func NewHTTPServer(cfg core.Config, l net.Listener) (srv *HTTPServer) {
srv = &HTTPServer{
Version: conf.Version,
Secure: conf.SecureCookie,
Secret: conf.Secret,
DataDir: conf.DataDir,
Config: cfg,
listener: l,
}
srv.loadTemplates()
@ -54,7 +48,7 @@ func NewHTTPServer(l net.Listener, conf core.Config) (srv *HTTPServer) {
}
func (s *HTTPServer) Start() (err error) {
s.DB, err = db.New(s.DataDir)
s.DB, err = db.New(s.Config)
if err != nil {
return errors.New("db: " + err.Error())
}
@ -62,8 +56,8 @@ func (s *HTTPServer) Start() (err error) {
if err != nil {
return
}
if s.Secret != "" {
s.JWT, err = jwt.New(jwt.DefaultExpiry, s.DB, bytes.NewBufferString(s.Secret))
if s.Config.Secret != "" {
s.JWT, err = jwt.New(jwt.DefaultExpiry, s.DB, bytes.NewBufferString(s.Config.Secret))
} else {
s.JWT, err = jwt.New(jwt.DefaultExpiry, s.DB, nil)
}