Fix URLFlag

Conflicts: main.go

Fix URLFlag
Conflicts: main.go
a9058bcd · Kamil Trzcinski · 8de2206c · a9058bcd · a9058bcd
Commit a9058bcd authored Jan 14, 2016 by Kamil Trzcinski
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

main.go main.go +1 -1

urlflag.go urlflag.go +7 -5

No files found.
--- a/main.go
+++ b/main.go
@@ -82,7 +82,7 @@ func main() {
 	}
 	up := upstream.NewUpstream(
-		authBackend,
+		*authBackend,
 		*authSocket,
 		Version,
 		*documentRoot,

--- a/urlflag.go
+++ b/urlflag.go
@@ -5,7 +5,9 @@ import (
 	"net/url"
 )
-type urlFlag struct{ *url.URL }
+type urlFlag struct {
+	*url.URL
+}
 func (u *urlFlag) Set(s string) error {
 	myURL, err := url.Parse(s)
@@ -16,8 +18,8 @@ func (u *urlFlag) Set(s string) error {
 	return nil
 }
-func URLFlag(name string, value *url.URL, usage string) *url.URL {
+func URLFlag(name string, value *url.URL, usage string) **url.URL {
-	f := urlFlag{value}
+	f := &urlFlag{value}
-	flag.CommandLine.Var(&f, name, usage)
+	flag.CommandLine.Var(f, name, usage)
-	return f.URL
+	return &f.URL
 }