ginS engine adjust

ginS/gins.go

@@ -7,100 +7,97 @@ package ginS
 import (
 	"html/template"
 	"net/http"
-	"sync"
 
 	"github.com/gin-gonic/gin"
 )
 
-var once sync.Once
-var internalEngine *gin.Engine
+var engine *gin.Engine
 
-func engine() *gin.Engine {
-	once.Do(func() {
-		internalEngine = gin.Default()
-	})
-	return internalEngine
+func init() {
+	if engine == nil {
+		engine = gin.Default()
+	}
 }
 
 // LoadHTMLGlob is a wrapper for Engine.LoadHTMLGlob.
 func LoadHTMLGlob(pattern string) {
-	engine().LoadHTMLGlob(pattern)
+	engine.LoadHTMLGlob(pattern)
 }
 
 // LoadHTMLFiles is a wrapper for Engine.LoadHTMLFiles.
 func LoadHTMLFiles(files ...string) {
-	engine().LoadHTMLFiles(files...)
+	engine.LoadHTMLFiles(files...)
 }
 
 // SetHTMLTemplate is a wrapper for Engine.SetHTMLTemplate.
 func SetHTMLTemplate(templ *template.Template) {
-	engine().SetHTMLTemplate(templ)
+	engine.SetHTMLTemplate(templ)
 }
 
 // NoRoute adds handlers for NoRoute. It return a 404 code by default.
 func NoRoute(handlers ...gin.HandlerFunc) {
-	engine().NoRoute(handlers...)
+	engine.NoRoute(handlers...)
 }
 
 // NoMethod is a wrapper for Engine.NoMethod.
 func NoMethod(handlers ...gin.HandlerFunc) {
-	engine().NoMethod(handlers...)
+	engine.NoMethod(handlers...)
 }
 
 // Group creates a new router group. You should add all the routes that have common middlewares or the same path prefix.
 // For example, all the routes that use a common middleware for authorization could be grouped.
 func Group(relativePath string, handlers ...gin.HandlerFunc) *gin.RouterGroup {
-	return engine().Group(relativePath, handlers...)
+	return engine.Group(relativePath, handlers...)
 }
 
 // Handle is a wrapper for Engine.Handle.
 func Handle(httpMethod, relativePath string, handlers ...gin.HandlerFunc) gin.IRoutes {
-	return engine().Handle(httpMethod, relativePath, handlers...)
+	return engine.Handle(httpMethod, relativePath, handlers...)
 }
 
 // POST is a shortcut for router.Handle("POST", path, handle)
 func POST(relativePath string, handlers ...gin.HandlerFunc) gin.IRoutes {
-	return engine().POST(relativePath, handlers...)
+	return engine.POST(relativePath, handlers...)
 }
 
 // GET is a shortcut for router.Handle("GET", path, handle)
 func GET(relativePath string, handlers ...gin.HandlerFunc) gin.IRoutes {
-	return engine().GET(relativePath, handlers...)
+	return engine.GET(relativePath, handlers...)
 }
 
 // DELETE is a shortcut for router.Handle("DELETE", path, handle)
 func DELETE(relativePath string, handlers ...gin.HandlerFunc) gin.IRoutes {
-	return engine().DELETE(relativePath, handlers...)
+	return engine.DELETE(relativePath, handlers...)
 }
 
 // PATCH is a shortcut for router.Handle("PATCH", path, handle)
 func PATCH(relativePath string, handlers ...gin.HandlerFunc) gin.IRoutes {
-	return engine().PATCH(relativePath, handlers...)
+	return engine.PATCH(relativePath, handlers...)
 }
 
 // PUT is a shortcut for router.Handle("PUT", path, handle)
 func PUT(relativePath string, handlers ...gin.HandlerFunc) gin.IRoutes {
-	return engine().PUT(relativePath, handlers...)
+	return engine.PUT(relativePath, handlers...)
 }
 
 // OPTIONS is a shortcut for router.Handle("OPTIONS", path, handle)
 func OPTIONS(relativePath string, handlers ...gin.HandlerFunc) gin.IRoutes {
-	return engine().OPTIONS(relativePath, handlers...)
+	return engine.OPTIONS(relativePath, handlers...)
 }
 
 // HEAD is a shortcut for router.Handle("HEAD", path, handle)
 func HEAD(relativePath string, handlers ...gin.HandlerFunc) gin.IRoutes {
-	return engine().HEAD(relativePath, handlers...)
+	return engine.HEAD(relativePath, handlers...)
 }
 
 // Any is a wrapper for Engine.Any.
 func Any(relativePath string, handlers ...gin.HandlerFunc) gin.IRoutes {
-	return engine().Any(relativePath, handlers...)
+	return engine.Any(relativePath, handlers...)
 }
 
 // StaticFile is a wrapper for Engine.StaticFile.
 func StaticFile(relativePath, filepath string) gin.IRoutes {
-	return engine().StaticFile(relativePath, filepath)
+	return engine.StaticFile(relativePath, filepath)
 }
 
 // Static serves files from the given file system root.
@@ -110,50 +107,50 @@ func StaticFile(relativePath, filepath string) gin.IRoutes {
 // use :
 //     router.Static("/static", "/var/www")
 func Static(relativePath, root string) gin.IRoutes {
-	return engine().Static(relativePath, root)
+	return engine.Static(relativePath, root)
 }
 
 // StaticFS is a wrapper for Engine.StaticFS.
 func StaticFS(relativePath string, fs http.FileSystem) gin.IRoutes {
-	return engine().StaticFS(relativePath, fs)
+	return engine.StaticFS(relativePath, fs)
 }
 
 // Use attaches a global middleware to the router. ie. the middlewares attached though Use() will be
 // included in the handlers chain for every single request. Even 404, 405, static files...
 // For example, this is the right place for a logger or error management middleware.
 func Use(middlewares ...gin.HandlerFunc) gin.IRoutes {
-	return engine().Use(middlewares...)
+	return engine.Use(middlewares...)
 }
 
 // Routes returns a slice of registered routes.
 func Routes() gin.RoutesInfo {
-	return engine().Routes()
+	return engine.Routes()
 }
 
 // Run attaches to a http.Server and starts listening and serving HTTP requests.
 // It is a shortcut for http.ListenAndServe(addr, router)
 // Note: this method will block the calling goroutine indefinitely unless an error happens.
 func Run(addr ...string) (err error) {
-	return engine().Run(addr...)
+	return engine.Run(addr...)
 }
 
 // RunTLS attaches to a http.Server and starts listening and serving HTTPS requests.
 // It is a shortcut for http.ListenAndServeTLS(addr, certFile, keyFile, router)
 // Note: this method will block the calling goroutine indefinitely unless an error happens.
 func RunTLS(addr, certFile, keyFile string) (err error) {
-	return engine().RunTLS(addr, certFile, keyFile)
+	return engine.RunTLS(addr, certFile, keyFile)
 }
 
 // RunUnix attaches to a http.Server and starts listening and serving HTTP requests
 // through the specified unix socket (ie. a file)
 // Note: this method will block the calling goroutine indefinitely unless an error happens.
 func RunUnix(file string) (err error) {
-	return engine().RunUnix(file)
+	return engine.RunUnix(file)
 }
 
 // RunFd attaches the router to a http.Server and starts listening and serving HTTP requests
 // through the specified file descriptor.
 // Note: the method will block the calling goroutine indefinitely unless on error happens.
 func RunFd(fd int) (err error) {
-	return engine().RunFd(fd)
+	return engine.RunFd(fd)
 }