TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-06-09 13:02:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixed json output for ls-routes and its API and homepage api

Browse source
This commit is contained in:
yusing 2024-10-15 16:23:46 +08:00
parent f4d532598c
commit 56b778f19c
5 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
internal/docker/idlewatcher/waker.go
View file

@ -8,6 +8,7 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
gphttp "github.com/yusing/go-proxy/internal/net/http" gphttp "github.com/yusing/go-proxy/internal/net/http"
"github.com/yusing/go-proxy/internal/net/types"
"github.com/yusing/go-proxy/internal/watcher/health" "github.com/yusing/go-proxy/internal/watcher/health"
) )
@ -72,6 +73,10 @@ func (w *Waker) Uptime() time.Duration {
} }
func (w *Waker) MarshalJSON() ([]byte, error) { func (w *Waker) MarshalJSON() ([]byte, error) {
var url types.URL
if w.URL.String() != "http://:0" {
url = w.URL
}
return (&health.JSONRepresentation{ return (&health.JSONRepresentation{
Name: w.Name(), Name: w.Name(),
Status: w.Status(), Status: w.Status(),
@ -79,7 +84,7 @@ func (w *Waker) MarshalJSON() ([]byte, error) {
Interval: w.IdleTimeout, Interval: w.IdleTimeout,
Timeout: w.WakeTimeout, Timeout: w.WakeTimeout,
}, },
URL: w.URL, URL: url,
}).MarshalJSON() }).MarshalJSON()
} }

7
internal/net/types/url.go
View file

@ -27,8 +27,11 @@ func (u URL) String() string {
return u.URL.String() return u.URL.String()
} }
func (u URL) MarshalText() (text []byte, err error) { func (u URL) MarshalJSON() (text []byte, err error) {
return []byte(u.String()), nil if u.URL == nil {
return []byte("null"), nil
}
return []byte("\"" + u.URL.String() + "\""), nil
} }
func (u URL) Equals(other *URL) bool { func (u URL) Equals(other *URL) bool {

2
internal/proxy/entry.go
View file

@ -54,7 +54,7 @@ func (rp *ReverseProxyEntry) UseIdleWatcher() bool {
} }
func (rp *ReverseProxyEntry) UseLoadBalance() bool { func (rp *ReverseProxyEntry) UseLoadBalance() bool {
return rp.LoadBalance.Link != "" return rp.LoadBalance != nil && rp.LoadBalance.Link != ""
} }
func (rp *ReverseProxyEntry) IsDocker() bool { func (rp *ReverseProxyEntry) IsDocker() bool {

2
internal/route/http.go
View file

@ -25,7 +25,7 @@ import (
type ( type (
HTTPRoute struct { HTTPRoute struct {
*P.ReverseProxyEntry `json:"entry"` *P.ReverseProxyEntry
HealthMon health.HealthMonitor `json:"health,omitempty"` HealthMon health.HealthMonitor `json:"health,omitempty"`

5
internal/watcher/health/json.go
View file

@ -5,6 +5,7 @@ import (
"time" "time"
"github.com/yusing/go-proxy/internal/net/types" "github.com/yusing/go-proxy/internal/net/types"
U "github.com/yusing/go-proxy/internal/utils"
) )
type JSONRepresentation struct { type JSONRepresentation struct {
@ -22,9 +23,11 @@ func (jsonRepr *JSONRepresentation) MarshalJSON() ([]byte, error) {
"name": jsonRepr.Name, "name": jsonRepr.Name,
"config": jsonRepr.Config, "config": jsonRepr.Config,
"started": jsonRepr.Started.Unix(), "started": jsonRepr.Started.Unix(),
"startedStr": U.FormatTime(jsonRepr.Started),
"status": jsonRepr.Status.String(), "status": jsonRepr.Status.String(),
"uptime": jsonRepr.Uptime.Seconds(), "uptime": jsonRepr.Uptime.Seconds(),
"url": jsonRepr.URL.String(), "uptimeStr": U.FormatDuration(jsonRepr.Uptime),
"url": jsonRepr.URL,
"extra": jsonRepr.Extra, "extra": jsonRepr.Extra,
}) })
} }