From d0899d6047f2ca213a916ae821f3d24b9c79864c Mon Sep 17 00:00:00 2001 From: dworld Date: Thu, 6 Nov 2014 15:46:05 +0800 Subject: [PATCH] update NewServer --- context_static.go | 1 - server.go | 13 ++++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/context_static.go b/context_static.go index 2f66464..16a0a1e 100644 --- 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 index 32b210e..afbb230 100644 --- 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) {