update NewServer

sipin · Nov 6, 2014 · d0899d6 · d0899d6
1 parent ec9da65
commit d0899d6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/context_static.go b/context_static.go
@@ -25,7 +25,6 @@ func (ctx *Context) GetStaticUrl(url string) string {
 	}
 
 	hash := ctx.getStaticFileHash(url)
-
 	if hash == "" {
 		return cfg.StaticHost + url
 	}

diff --git a/server.go b/server.go
@@ -3,6 +3,7 @@ package xingyun
 import (
 	"net/http"
 
+	"code.1dmy.com/xyz/logex"
 	"github.com/gorilla/securecookie"
 )
 
@@ -21,11 +22,17 @@ type Server struct {
 
 	Name         string
 	Logger       Logger
-	SecureCookie securecookie.SecureCookie
+	SecureCookie *securecookie.SecureCookie
 }
 
-func NewServer(router Router, logger Logger) *Server {
-	return &Server{Router: router, Logger: logger}
+func NewServer(config *Config) *Server {
+	server := &Server{
+		Router: NewRouter(),
+		Logger: logex.NewLogger(1),
+	}
+	server.StaticDir = http.Dir(config.StaticDir)
+	server.SecureCookie = securecookie.New([]byte(config.CookieSecret), []byte(config.CookieSecret))
+	return server
 }
 
 func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,6 @@ func (ctx *Context) GetStaticUrl(url string) string { @@
     	}
     	hash := ctx.getStaticFileHash(url)
     	if hash == "" {
     		return cfg.StaticHost + url
     	}
@@ Expand Down @@