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

TUN-3328: Filter out free tunnel has started log from UI

This commit is contained in:
Rachel Williams 2020-08-26 12:19:24 -07:00 committed by Areg Harutyunyan
parent 02587c1edc
commit bb530b87dd
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
origin/tunnel.go
View File

@ -537,7 +537,8 @@ func processRegistrationSuccess(
logger.Infof("Each HA connection's tunnel IDs: %v", config.Metrics.tunnelsHA.String()) logger.Infof("Each HA connection's tunnel IDs: %v", config.Metrics.tunnelsHA.String())
} }
// Print out the user's trial zone URL in a nice box (if they requested and got one) // Print out the user's trial zone URL in a nice box (if they requested and got one and UI flag is not set)
if config.TunnelEventChan == nil {
if isTrialTunnel := config.Hostname == ""; isTrialTunnel { if isTrialTunnel := config.Hostname == ""; isTrialTunnel {
if url, err := url.Parse(registration.Url); err == nil { if url, err := url.Parse(registration.Url); err == nil {
for _, line := range asciiBox(trialZoneMsg(url.String()), 2) { for _, line := range asciiBox(trialZoneMsg(url.String()), 2) {
@ -548,6 +549,7 @@ func processRegistrationSuccess(
return fmt.Errorf("empty URL in response from Cloudflare edge") return fmt.Errorf("empty URL in response from Cloudflare edge")
} }
} }
}
credentialManager.SetConnDigest(connectionID, registration.ConnDigest) credentialManager.SetConnDigest(connectionID, registration.ConnDigest)
config.Metrics.userHostnamesCounts.WithLabelValues(registration.Url).Inc() config.Metrics.userHostnamesCounts.WithLabelValues(registration.Url).Inc()