Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
edeae23bf1
|
|||
a038b86147
|
|||
ede0b99d3a
|
@@ -68,6 +68,9 @@ func NewEngine(allowCors bool, ginDebug bool, timeout time.Duration) *GinWrapper
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (w *GinWrapper) ListenAndServeHTTP(addr string, postInit func(port string)) (chan error, *http.Server) {
|
func (w *GinWrapper) ListenAndServeHTTP(addr string, postInit func(port string)) (chan error, *http.Server) {
|
||||||
|
|
||||||
|
w.DebugPrintRoutes()
|
||||||
|
|
||||||
httpserver := &http.Server{
|
httpserver := &http.Server{
|
||||||
Addr: addr,
|
Addr: addr,
|
||||||
Handler: w.engine,
|
Handler: w.engine,
|
||||||
@@ -92,7 +95,7 @@ func (w *GinWrapper) ListenAndServeHTTP(addr string, postInit func(port string))
|
|||||||
log.Info().Str("address", httpserver.Addr).Msg("HTTP-Server started on http://localhost:" + port)
|
log.Info().Str("address", httpserver.Addr).Msg("HTTP-Server started on http://localhost:" + port)
|
||||||
|
|
||||||
if postInit != nil {
|
if postInit != nil {
|
||||||
postInit(port)
|
postInit(port) // the net.Listener a few lines above is at this point actually already buffering requests
|
||||||
}
|
}
|
||||||
|
|
||||||
errChan <- httpserver.Serve(ln)
|
errChan <- httpserver.Serve(ln)
|
||||||
@@ -115,8 +118,8 @@ func (w *GinWrapper) DebugPrintRoutes() {
|
|||||||
line := [4]string{
|
line := [4]string{
|
||||||
spec.Method,
|
spec.Method,
|
||||||
spec.URL,
|
spec.URL,
|
||||||
strings.Join(spec.Middlewares, " --> "),
|
strings.Join(spec.Middlewares, " -> "),
|
||||||
spec.Method,
|
spec.Handler,
|
||||||
}
|
}
|
||||||
|
|
||||||
lines = append(lines, line)
|
lines = append(lines, line)
|
||||||
@@ -129,8 +132,8 @@ func (w *GinWrapper) DebugPrintRoutes() {
|
|||||||
|
|
||||||
for _, line := range lines {
|
for _, line := range lines {
|
||||||
|
|
||||||
fmt.Printf("Gin-Route: [%s] @ %s --> %s --> %s\n",
|
fmt.Printf("Gin-Route: %s %s --> %s --> %s\n",
|
||||||
langext.StrPadRight(line[0], " ", pad[0]),
|
langext.StrPadRight("["+line[0]+"]", " ", pad[0]+2),
|
||||||
langext.StrPadRight(line[1], " ", pad[1]),
|
langext.StrPadRight(line[1], " ", pad[1]),
|
||||||
langext.StrPadRight(line[2], " ", pad[2]),
|
langext.StrPadRight(line[2], " ", pad[2]),
|
||||||
langext.StrPadRight(line[3], " ", pad[3]))
|
langext.StrPadRight(line[3], " ", pad[3]))
|
||||||
|
@@ -123,12 +123,23 @@ func (w *GinWrapper) NoRoute(handler WHandlerFunc) {
|
|||||||
|
|
||||||
func nameOfFunction(f any) string {
|
func nameOfFunction(f any) string {
|
||||||
|
|
||||||
n := runtime.FuncForPC(reflect.ValueOf(f).Pointer()).Name()
|
fname := runtime.FuncForPC(reflect.ValueOf(f).Pointer()).Name()
|
||||||
|
|
||||||
split := strings.Split(n, "/")
|
split := strings.Split(fname, "/")
|
||||||
if len(split) == 0 {
|
if len(split) == 0 {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
return split[len(split)-1]
|
fname = split[len(split)-1]
|
||||||
|
|
||||||
|
// https://stackoverflow.com/a/32925345/1761622
|
||||||
|
if strings.HasSuffix(fname, "-fm") {
|
||||||
|
fname = fname[:len(fname)-len("-fm")]
|
||||||
|
}
|
||||||
|
|
||||||
|
if strings.HasSuffix(fname, ".func1") {
|
||||||
|
fname = fname[:len(fname)-len(".func1")]
|
||||||
|
}
|
||||||
|
|
||||||
|
return fname
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package goext
|
package goext
|
||||||
|
|
||||||
const GoextVersion = "0.0.202"
|
const GoextVersion = "0.0.205"
|
||||||
|
|
||||||
const GoextVersionTimestamp = "2023-07-24T18:34:56+0200"
|
const GoextVersionTimestamp = "2023-07-24T18:47:48+0200"
|
||||||
|
Reference in New Issue
Block a user