roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge pull request #13851 from karalabe/ethstats-url-scheme-discovery

Browse Source 
ethstats: work around weird URL scheme parsing issues
This commit is contained in:
Péter Szilágyi 2017-03-30 13:25:17 +03:00 committed by GitHub
commit c4a0efafd7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ethstats/ethstats.go
View File

@ -23,10 +23,10 @@ import (
"fmt" "fmt"
"math/big" "math/big"
"net" "net"
"net/url"
"regexp" "regexp"
"runtime" "runtime"
"strconv" "strconv"
"strings"
"time" "time"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
@ -128,7 +128,7 @@ func (s *Service) loop() {
path := fmt.Sprintf("%s/api", s.host) path := fmt.Sprintf("%s/api", s.host)
urls := []string{path} urls := []string{path}
if parsed, err := url.Parse(path); err == nil && !parsed.IsAbs() { if !strings.Contains(path, "://") { // url.Parse and url.IsAbs is unsuitable (https://github.com/golang/go/issues/19779)
urls = []string{"wss://" + path, "ws://" + path} urls = []string{"wss://" + path, "ws://" + path}
} }
// Establish a websocket connection to the server on any supported URL // Establish a websocket connection to the server on any supported URL