xfy/lolly
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: eliminate redundant switch blocks in router.go LocationEngine functions

Browse Source
This commit is contained in:
xfy 2026-06-03 17:54:51 +08:00
parent 6e481c36c5
commit c1796dadc5
1 changed files with 11 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
internal/server/router.go
View File

@ -115,34 +115,14 @@ func (s *Server) registerProxyRoutesWithLocationEngine(serverCfg *config.ServerC
locType = matcher.LocationTypePrefix
}
switch locType {
case matcher.LocationTypeExact:
if err := s.registerRoute(locType, proxyCfg.Path, p.ServeHTTP, proxyCfg.Internal, "proxy"); err != nil {
path := proxyCfg.Path
if locType == matcher.LocationTypeNamed && proxyCfg.LocationName != "" {
path = "@" + proxyCfg.LocationName
}
if err := s.registerRoute(locType, path, p.ServeHTTP, proxyCfg.Internal, "proxy"); err != nil {
return err
}
case matcher.LocationTypePrefixPriority:
if err := s.registerRoute(locType, proxyCfg.Path, p.ServeHTTP, proxyCfg.Internal, "proxy"); err != nil {
return err
}
case matcher.LocationTypeRegex, matcher.LocationTypeRegexCaseless:
if err := s.registerRoute(locType, proxyCfg.Path, p.ServeHTTP, proxyCfg.Internal, "proxy"); err != nil {
return err
}
case matcher.LocationTypeNamed:
if proxyCfg.LocationName != "" {
if err := s.registerRoute(locType, "@"+proxyCfg.LocationName, p.ServeHTTP, false, "proxy"); err != nil {
return err
}
}
case matcher.LocationTypePrefix:
if err := s.registerRoute(locType, proxyCfg.Path, p.ServeHTTP, proxyCfg.Internal, "proxy"); err != nil {
return err
}
default:
if err := s.registerRoute(locType, proxyCfg.Path, p.ServeHTTP, proxyCfg.Internal, "proxy"); err != nil {
return err
}
}
}
return nil
}
@ -214,24 +194,9 @@ func (s *Server) registerStaticHandlersWithLocationEngine(cfg *config.ServerConf
locType = matcher.LocationTypePrefix
}
switch locType {
case matcher.LocationTypeExact:
if err := s.registerRoute(locType, path, staticHandler.Handle, static.Internal, "static"); err != nil {
return err
}
case matcher.LocationTypePrefixPriority:
if err := s.registerRoute(locType, path, staticHandler.Handle, static.Internal, "static"); err != nil {
return err
}
case matcher.LocationTypePrefix:
if err := s.registerRoute(locType, path, staticHandler.Handle, static.Internal, "static"); err != nil {
return err
}
default:
if err := s.registerRoute(locType, path, staticHandler.Handle, static.Internal, "static"); err != nil {
return err
}
}
}
return nil
}
@ -399,28 +364,9 @@ func (s *Server) registerLuaRoutesWithLocationEngine(serverCfg *config.ServerCon
routeType = matcher.LocationTypePrefix
}
switch routeType {
case matcher.LocationTypeExact:
if err := s.registerRoute(routeType, script.Route, handler, false, "lua"); err != nil {
return err
}
case matcher.LocationTypePrefixPriority:
if err := s.registerRoute(routeType, script.Route, handler, false, "lua"); err != nil {
return err
}
case matcher.LocationTypeRegex, matcher.LocationTypeRegexCaseless:
if err := s.registerRoute(routeType, script.Route, handler, false, "lua"); err != nil {
return err
}
case matcher.LocationTypePrefix:
if err := s.registerRoute(routeType, script.Route, handler, false, "lua"); err != nil {
return err
}
default:
if err := s.registerRoute(routeType, script.Route, handler, false, "lua"); err != nil {
return err
}
}
}
return nil
}