mirror of
https://github.com/Sagit-chu/flvx.git
synced 2026-10-07 10:16:38 +08:00
fix: preserve probe targets in backups
This commit is contained in:
@@ -405,19 +405,21 @@ type NodeBackup struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type TunnelBackup struct {
|
type TunnelBackup struct {
|
||||||
ID int64 `json:"id"`
|
ID int64 `json:"id"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
TrafficRatio float64 `json:"trafficRatio"`
|
TrafficRatio float64 `json:"trafficRatio"`
|
||||||
Type int `json:"type"`
|
Type int `json:"type"`
|
||||||
Protocol string `json:"protocol"`
|
Protocol string `json:"protocol"`
|
||||||
Flow int64 `json:"flow"`
|
Flow int64 `json:"flow"`
|
||||||
CreatedTime int64 `json:"createdTime"`
|
CreatedTime int64 `json:"createdTime"`
|
||||||
UpdatedTime int64 `json:"updatedTime"`
|
UpdatedTime int64 `json:"updatedTime"`
|
||||||
Status int `json:"status"`
|
Status int `json:"status"`
|
||||||
InIP string `json:"inIp,omitempty"`
|
InIP string `json:"inIp,omitempty"`
|
||||||
Inx int `json:"inx"`
|
Inx int `json:"inx"`
|
||||||
IPPreference string `json:"ipPreference,omitempty"`
|
IPPreference string `json:"ipPreference,omitempty"`
|
||||||
ChainTunnels []ChainTunnelBackup `json:"chainTunnels,omitempty"`
|
ProbeTargetHost string `json:"probeTargetHost,omitempty"`
|
||||||
|
ProbeTargetPort int `json:"probeTargetPort,omitempty"`
|
||||||
|
ChainTunnels []ChainTunnelBackup `json:"chainTunnels,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ChainTunnelBackup struct {
|
type ChainTunnelBackup struct {
|
||||||
|
|||||||
@@ -2063,6 +2063,7 @@ func (r *Repository) exportTunnels() ([]model.TunnelBackup, error) {
|
|||||||
Type: t.Type, Protocol: t.Protocol, Flow: t.Flow,
|
Type: t.Type, Protocol: t.Protocol, Flow: t.Flow,
|
||||||
CreatedTime: t.CreatedTime, UpdatedTime: t.UpdatedTime,
|
CreatedTime: t.CreatedTime, UpdatedTime: t.UpdatedTime,
|
||||||
Status: t.Status, Inx: t.Inx, IPPreference: t.IPPreference,
|
Status: t.Status, Inx: t.Inx, IPPreference: t.IPPreference,
|
||||||
|
ProbeTargetHost: t.ProbeTargetHost, ProbeTargetPort: t.ProbeTargetPort,
|
||||||
}
|
}
|
||||||
if t.InIP.Valid {
|
if t.InIP.Valid {
|
||||||
b.InIP = t.InIP.String
|
b.InIP = t.InIP.String
|
||||||
@@ -2458,23 +2459,25 @@ func importTunnels(tx *gorm.DB, tunnels []model.TunnelBackup, now int64) (int, e
|
|||||||
count := 0
|
count := 0
|
||||||
for _, t := range tunnels {
|
for _, t := range tunnels {
|
||||||
item := model.Tunnel{
|
item := model.Tunnel{
|
||||||
ID: t.ID,
|
ID: t.ID,
|
||||||
Name: t.Name,
|
Name: t.Name,
|
||||||
TrafficRatio: t.TrafficRatio,
|
TrafficRatio: t.TrafficRatio,
|
||||||
Type: t.Type,
|
Type: t.Type,
|
||||||
Protocol: t.Protocol,
|
Protocol: t.Protocol,
|
||||||
Flow: t.Flow,
|
Flow: t.Flow,
|
||||||
CreatedTime: t.CreatedTime,
|
CreatedTime: t.CreatedTime,
|
||||||
UpdatedTime: now,
|
UpdatedTime: now,
|
||||||
Status: t.Status,
|
Status: t.Status,
|
||||||
InIP: sql.NullString{String: t.InIP, Valid: true},
|
InIP: sql.NullString{String: t.InIP, Valid: true},
|
||||||
Inx: t.Inx,
|
Inx: t.Inx,
|
||||||
IPPreference: t.IPPreference,
|
IPPreference: t.IPPreference,
|
||||||
|
ProbeTargetHost: t.ProbeTargetHost,
|
||||||
|
ProbeTargetPort: t.ProbeTargetPort,
|
||||||
}
|
}
|
||||||
err := tx.Clauses(clause.OnConflict{
|
err := tx.Clauses(clause.OnConflict{
|
||||||
Columns: []clause.Column{{Name: "id"}},
|
Columns: []clause.Column{{Name: "id"}},
|
||||||
DoUpdates: clause.AssignmentColumns([]string{
|
DoUpdates: clause.AssignmentColumns([]string{
|
||||||
"name", "traffic_ratio", "type", "protocol", "flow", "updated_time", "status", "in_ip", "inx", "ip_preference",
|
"name", "traffic_ratio", "type", "protocol", "flow", "updated_time", "status", "in_ip", "inx", "ip_preference", "probe_target_host", "probe_target_port",
|
||||||
}),
|
}),
|
||||||
}).Create(&item).Error
|
}).Create(&item).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
package repo
|
||||||
|
|
||||||
|
import (
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestBackupRoundTripsTunnelProbeTarget(t *testing.T) {
|
||||||
|
source, err := Open(filepath.Join(t.TempDir(), "source.db"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open source repo: %v", err)
|
||||||
|
}
|
||||||
|
defer source.Close()
|
||||||
|
|
||||||
|
now := time.Now().UnixMilli()
|
||||||
|
if err := source.DB().Exec(`
|
||||||
|
INSERT INTO tunnel(id, name, traffic_ratio, type, protocol, flow, created_time, updated_time, status, in_ip, inx, probe_target_host, probe_target_port)
|
||||||
|
VALUES(20, 'backup-target', 1, 2, 'tls', 1, ?, ?, 1, '', 1, 'speed.example.com', 8443)
|
||||||
|
`, now, now).Error; err != nil {
|
||||||
|
t.Fatalf("insert source tunnel: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
backup, err := source.ExportAll()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("export backup: %v", err)
|
||||||
|
}
|
||||||
|
if len(backup.Tunnels) != 1 {
|
||||||
|
t.Fatalf("expected one exported tunnel, got %d", len(backup.Tunnels))
|
||||||
|
}
|
||||||
|
if backup.Tunnels[0].ProbeTargetHost != "speed.example.com" || backup.Tunnels[0].ProbeTargetPort != 8443 {
|
||||||
|
t.Fatalf("unexpected exported probe target: %+v", backup.Tunnels[0])
|
||||||
|
}
|
||||||
|
|
||||||
|
dest, err := Open(filepath.Join(t.TempDir(), "dest.db"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open dest repo: %v", err)
|
||||||
|
}
|
||||||
|
defer dest.Close()
|
||||||
|
|
||||||
|
result, err := dest.Import(backup, []string{"tunnels"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("import backup: %v", err)
|
||||||
|
}
|
||||||
|
if result.TunnelsImported != 1 {
|
||||||
|
t.Fatalf("expected one imported tunnel, got %d", result.TunnelsImported)
|
||||||
|
}
|
||||||
|
|
||||||
|
items, err := dest.ListTunnels()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("list imported tunnels: %v", err)
|
||||||
|
}
|
||||||
|
if len(items) != 1 {
|
||||||
|
t.Fatalf("expected one imported tunnel item, got %d", len(items))
|
||||||
|
}
|
||||||
|
if items[0]["probeTargetHost"] != "speed.example.com" || items[0]["probeTargetPort"] != 8443 {
|
||||||
|
t.Fatalf("unexpected imported probe target: %+v", items[0])
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user