curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-2696: Add unknown registerRPCName

This commit is contained in:
Adam Chalmers 2020-01-28 11:29:33 -06:00
parent e31ff3a70f
commit d5139d3882
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
origin/tunnel.go
View File

@ -45,6 +45,7 @@ type registerRPCName string
const ( const (
register registerRPCName = "register" register registerRPCName = "register"
reconnect registerRPCName = "reconnect" reconnect registerRPCName = "reconnect"
unknown registerRPCName = "unknown"
) )
type TunnelConfig struct { type TunnelConfig struct {
@ -120,8 +121,8 @@ type clientRegisterTunnelError struct {
cause error cause error
} }
func newClientRegisterTunnelError(cause error, counter *prometheus.CounterVec) clientRegisterTunnelError { func newClientRegisterTunnelError(cause error, counter *prometheus.CounterVec, name registerRPCName) clientRegisterTunnelError {
counter.WithLabelValues(cause.Error()).Inc() counter.WithLabelValues(cause.Error(), string(name)).Inc()
return clientRegisterTunnelError{cause: cause} return clientRegisterTunnelError{cause: cause}
} }
@ -313,7 +314,7 @@ func ServeTunnel(
err = errGroup.Wait() err = errGroup.Wait()
if err != nil { if err != nil {
_ = newClientRegisterTunnelError(err, config.Metrics.regFail) _ = newClientRegisterTunnelError(err, config.Metrics.regFail, unknown)
switch castedErr := err.(type) { switch castedErr := err.(type) {
case dupConnRegisterTunnelError: case dupConnRegisterTunnelError:
@ -355,7 +356,7 @@ func RegisterTunnel(
tunnelServer, err := connection.NewRPCClient(ctx, muxer, config.TransportLogger.WithField("subsystem", "rpc-register"), openStreamTimeout) tunnelServer, err := connection.NewRPCClient(ctx, muxer, config.TransportLogger.WithField("subsystem", "rpc-register"), openStreamTimeout)
if err != nil { if err != nil {
// RPC stream open error // RPC stream open error
return newClientRegisterTunnelError(err, config.Metrics.rpcFail) return newClientRegisterTunnelError(err, config.Metrics.rpcFail, register)
} }
defer tunnelServer.Close() defer tunnelServer.Close()
// Request server info without blocking tunnel registration; must use capnp library directly. // Request server info without blocking tunnel registration; must use capnp library directly.
@ -392,7 +393,7 @@ func ReconnectTunnel(
tunnelServer, err := connection.NewRPCClient(ctx, muxer, config.TransportLogger.WithField("subsystem", "rpc-reconnect"), openStreamTimeout) tunnelServer, err := connection.NewRPCClient(ctx, muxer, config.TransportLogger.WithField("subsystem", "rpc-reconnect"), openStreamTimeout)
if err != nil { if err != nil {
// RPC stream open error // RPC stream open error
return newClientRegisterTunnelError(err, config.Metrics.rpcFail) return newClientRegisterTunnelError(err, config.Metrics.rpcFail, reconnect)
} }
defer tunnelServer.Close() defer tunnelServer.Close()
// Request server info without blocking tunnel registration; must use capnp library directly. // Request server info without blocking tunnel registration; must use capnp library directly.