forked from tangled.org/core
Monorepo for Tangled

avoid recheck of env to set dev mode

Changed files
+6 -7
appview
+1 -1
appview/state/repo.go
··· 395 return 396 } 397 398 - ksClient, err := NewSignedClient(f.Knot, secret) 399 if err != nil { 400 log.Println("failed to create client to ", f.Knot) 401 return
··· 395 return 396 } 397 398 + ksClient, err := NewSignedClient(f.Knot, secret, s.config.Dev) 399 if err != nil { 400 log.Println("failed to create client to ", f.Knot) 401 return
+2 -3
appview/state/signer.go
··· 9 "fmt" 10 "net/http" 11 "net/url" 12 - "os" 13 "time" 14 ) 15 ··· 34 client *http.Client 35 } 36 37 - func NewSignedClient(domain, secret string) (*SignedClient, error) { 38 client := &http.Client{ 39 Timeout: 5 * time.Second, 40 Transport: SignerTransport{ ··· 43 } 44 45 uri := "https" 46 - if os.Getenv("TANGLED_DEV") == "true" { 47 uri = "http" 48 } 49 url, err := url.Parse(fmt.Sprintf("%s://%s", uri, domain))
··· 9 "fmt" 10 "net/http" 11 "net/url" 12 "time" 13 ) 14 ··· 33 client *http.Client 34 } 35 36 + func NewSignedClient(domain, secret string, dev bool) (*SignedClient, error) { 37 client := &http.Client{ 38 Timeout: 5 * time.Second, 39 Transport: SignerTransport{ ··· 42 } 43 44 uri := "https" 45 + if dev { 46 uri = "http" 47 } 48 url, err := url.Parse(fmt.Sprintf("%s://%s", uri, domain))
+3 -3
appview/state/state.go
··· 256 return 257 } 258 259 - client, err := NewSignedClient(domain, secret) 260 if err != nil { 261 log.Println("failed to create client to ", domain) 262 } ··· 450 return 451 } 452 453 - ksClient, err := NewSignedClient(domain, secret) 454 if err != nil { 455 log.Println("failed to create client to ", domain) 456 return ··· 526 return 527 } 528 529 - client, err := NewSignedClient(domain, secret) 530 if err != nil { 531 s.pages.Notice(w, "repo", "Failed to connect to knot server.") 532 return
··· 256 return 257 } 258 259 + client, err := NewSignedClient(domain, secret, s.config.Dev) 260 if err != nil { 261 log.Println("failed to create client to ", domain) 262 } ··· 450 return 451 } 452 453 + ksClient, err := NewSignedClient(domain, secret, s.config.Dev) 454 if err != nil { 455 log.Println("failed to create client to ", domain) 456 return ··· 526 return 527 } 528 529 + client, err := NewSignedClient(domain, secret, s.config.Dev) 530 if err != nil { 531 s.pages.Notice(w, "repo", "Failed to connect to knot server.") 532 return