mirror of
https://github.com/yusing/godoxy.git
synced 2026-03-26 02:51:07 +01:00
refactor and remove unused code
This commit is contained in:
@@ -36,9 +36,8 @@ func (res *fetchResult) ContentType() string {
|
||||
if res.contentType == "" {
|
||||
if bytes.HasPrefix(res.icon, []byte("<svg")) || bytes.HasPrefix(res.icon, []byte("<?xml")) {
|
||||
return "image/svg+xml"
|
||||
} else {
|
||||
return "image/x-icon"
|
||||
}
|
||||
return "image/x-icon"
|
||||
}
|
||||
return res.contentType
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
//nolint:misspell
|
||||
package common
|
||||
|
||||
var (
|
||||
|
||||
@@ -11,11 +11,10 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
logger zerolog.Logger
|
||||
timeFmt string
|
||||
level zerolog.Level
|
||||
prefix string
|
||||
prefixHTML []byte
|
||||
logger zerolog.Logger
|
||||
timeFmt string
|
||||
level zerolog.Level
|
||||
prefix string
|
||||
)
|
||||
|
||||
func init() {
|
||||
@@ -32,8 +31,6 @@ func init() {
|
||||
}
|
||||
prefixLength := len(timeFmt) + 5 // level takes 3 + 2 spaces
|
||||
prefix = strings.Repeat(" ", prefixLength)
|
||||
// prefixHTML = []byte(strings.Repeat(" ", prefixLength))
|
||||
prefixHTML = []byte(prefix)
|
||||
|
||||
if zerolog.TraceLevel != -1 && zerolog.NoLevel != 6 {
|
||||
panic("zerolog implementation changed")
|
||||
|
||||
@@ -37,26 +37,6 @@ func (handler *EventHandler) Handle(parent task.Parent, events []watcher.Event)
|
||||
}
|
||||
}
|
||||
|
||||
// if common.IsDebug {
|
||||
// eventsLog := E.NewBuilder("events")
|
||||
// for _, event := range events {
|
||||
// eventsLog.Addf("event %s, actor: name=%s, id=%s", event.Action, event.ActorName, event.ActorID)
|
||||
// }
|
||||
// E.LogDebug(eventsLog.About(), eventsLog.Error(), handler.provider.Logger())
|
||||
|
||||
// oldRoutesLog := E.NewBuilder("old routes")
|
||||
// for k := range oldRoutes {
|
||||
// oldRoutesLog.Adds(k)
|
||||
// }
|
||||
// E.LogDebug(oldRoutesLog.About(), oldRoutesLog.Error(), handler.provider.Logger())
|
||||
|
||||
// newRoutesLog := E.NewBuilder("new routes")
|
||||
// for k := range newRoutes {
|
||||
// newRoutesLog.Adds(k)
|
||||
// }
|
||||
// E.LogDebug(newRoutesLog.About(), newRoutesLog.Error(), handler.provider.Logger())
|
||||
// }
|
||||
|
||||
for k, oldr := range oldRoutes {
|
||||
newr, ok := newRoutes[k]
|
||||
switch {
|
||||
|
||||
@@ -41,7 +41,6 @@ type (
|
||||
|
||||
// var globalMux = http.NewServeMux() // TODO: support regex subdomain matching.
|
||||
|
||||
// TODO: fix this for agent
|
||||
func NewReverseProxyRoute(base *Route) (*ReveseProxyRoute, E.Error) {
|
||||
httpConfig := base.HTTPConfig
|
||||
proxyURL := base.ProxyURL
|
||||
|
||||
@@ -280,14 +280,15 @@ func (r *Route) Finalize() {
|
||||
}
|
||||
|
||||
if pp == 0 {
|
||||
if isDocker {
|
||||
switch {
|
||||
case isDocker:
|
||||
pp = lowestPort(cont.PrivatePortMapping)
|
||||
if pp == 0 {
|
||||
pp = lowestPort(cont.PublicPortMapping)
|
||||
}
|
||||
} else if r.Scheme == "https" {
|
||||
case r.Scheme == "https":
|
||||
pp = 443
|
||||
} else {
|
||||
default:
|
||||
pp = 80
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user