| skipped 68 lines |
| 69 | 69 | | } |
| 70 | 70 | | server, err := listener.TCPListen(sigCtx, proxy, tun) |
| 71 | 71 | | if err != nil { |
| 72 | | - | xlog.Error(errors.SignalListenerError, "id", pys.id, "addr", proxy.Addr(), "err", err) |
| | 72 | + | xlog.Error(errors.SignalListenerError, "id", pys.id, "type", proxy.Type, "addr", proxy.Addr(), "err", err) |
| 73 | 73 | | } |
| 74 | 74 | | sb.canceler[pys.id] = cancel |
| 75 | 75 | | sb.listener[pys.id] = server |
| 76 | | - | xlog.Info(xlog.SignalListenStart, "id", pys.id, "addr", proxy.Addr()) |
| | 76 | + | xlog.Info(xlog.SignalListenStart, "id", pys.id, "type", proxy.Type, "addr", proxy.Addr()) |
| 77 | 77 | | case enum.ProxyStatusInactive: |
| 78 | 78 | | if cancel, ok := sb.canceler[pys.id]; ok { |
| 79 | 79 | | // 先调一下 cancel |
| skipped 3 lines |
| 83 | 83 | | err := ln.Close() |
| 84 | 84 | | if err != nil { |
| 85 | 85 | | // 错了就错了吧，说明 ctx 挂了一般 goroutines 也跟着挂了 |
| 86 | | - | xlog.Error(errors.SignalListenerError, "id", pys.id, "addr", proxy.Addr(), "err", err) |
| | 86 | + | xlog.Error(errors.SignalListenerError, "id", pys.id, "type", proxy.Type, "addr", proxy.Addr(), "err", err) |
| 87 | 87 | | } |
| 88 | 88 | | } |
| 89 | 89 | | } |
| 90 | | - | xlog.Info(xlog.SignalListenStop, "id", pys.id, "addr", proxy.Addr()) |
| | 90 | + | xlog.Info(xlog.SignalListenStop, "id", pys.id, "type", proxy.Type, "addr", proxy.Addr()) |
| 91 | 91 | | case enum.ProxyStatusSpeeding: |
| 92 | 92 | | if err = service.SVC.SpeedProxy(ctx, proxy); err != nil { |
| 93 | 93 | | _ = service.SVC.UpdateProxyStatus(ctx, proxy.ID, enum.ProxyStatusError, err.Error()) |
| 94 | | - | xlog.Error(errors.SignalSpeedTestError, "id", pys.id, "addr", proxy.Addr(), "err", err) |
| | 94 | + | xlog.Error(errors.SignalSpeedTestError, "id", pys.id, "type", proxy.Type, "addr", proxy.Addr(), "err", err) |
| 95 | 95 | | } |
| 96 | 96 | | if err = service.SVC.UpdateProxyStatus(ctx, proxy.ID, enum.ProxyStatusActive, ""); err != nil { |
| 97 | | - | xlog.Error(errors.SignalUpdateObjError, "id", pys.id, "addr", proxy.Addr(), "err", err) |
| | 97 | + | xlog.Error(errors.SignalUpdateObjError, "id", pys.id, "type", proxy.Type, "addr", proxy.Addr(), "err", err) |
| 98 | 98 | | } |
| 99 | 99 | | } |
| 100 | 100 | | case prs := <-sb.providerChannel: |
| skipped 8 lines |
| 109 | 109 | | if err != nil { |
| 110 | 110 | | xlog.Error(errors.SignalGetObjError, "err", err) |
| 111 | 111 | | } |
| | 112 | + | } |
| | 113 | + | } |
| | 114 | + | } |
| | 115 | + | |
| | 116 | + | func (sb *Bus) Recover(ctx context.Context, recover string) { |
| | 117 | + | // 首先看一下是否需要恢复运行状态的服务 |
| | 118 | + | proxies, err := service.SVC.ListActiveProxies(ctx) |
| | 119 | + | if err != nil { |
| | 120 | + | xlog.Error(errors.SignalRecoverProxyError, "err", err) |
| | 121 | + | } |
| | 122 | + | for _, p := range proxies { |
| | 123 | + | if recover == "true" { |
| | 124 | + | xlog.Info(xlog.SignalListenRecover, "id", p.ID, "type", p.Type, "addr", p.Addr()) |
| | 125 | + | sb.SendProxySignal(p.ID, *p.Status) |
| | 126 | + | } else { |
| | 127 | + | _ = service.SVC.UpdateProxyStatus(ctx, p.ID, enum.ProxyStatusInactive, "reboot") |
| 112 | 128 | | } |
| 113 | 129 | | } |
| 114 | 130 | | } |
| skipped 22 lines |
