archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-14 14:11:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating from legacy (import "appengine") packages

Browse source 
* Ran, `go get google.golang.org/appengine/cmd/aefix`
   from https://github.com/golang/appengine
This commit is contained in:
Arlo Breault 2017-10-12 17:15:08 -04:00
parent 0c02af35d0
commit fd217ffaab
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
appengine/reflect.go
View file

@ -8,8 +8,10 @@ import (
"net/url" "net/url"
"time" "time"
"appengine" "golang.org/x/net/context"
"appengine/urlfetch" "google.golang.org/appengine"
"google.golang.org/appengine/log"
"google.golang.org/appengine/urlfetch"
) )
const ( const (
@ -18,7 +20,7 @@ const (
urlFetchTimeout = 20 * time.Second urlFetchTimeout = 20 * time.Second
) )
var context appengine.Context var context_ context.Context
// Join two URL paths. // Join two URL paths.
func pathJoin(a, b string) string { func pathJoin(a, b string) string {
@ -65,17 +67,17 @@ func copyRequest(r *http.Request) (*http.Request, error) {
} }
func handler(w http.ResponseWriter, r *http.Request) { func handler(w http.ResponseWriter, r *http.Request) {
context = appengine.NewContext(r) context_ = appengine.NewContext(r)
fr, err := copyRequest(r) fr, err := copyRequest(r)
if err != nil { if err != nil {
context.Errorf("copyRequest: %s", err) log.Errorf(context_, "copyRequest: %s", err)
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return return
} }
// Use urlfetch.Transport directly instead of urlfetch.Client because we // Use urlfetch.Transport directly instead of urlfetch.Client because we
// want only a single HTTP transaction, not following redirects. // want only a single HTTP transaction, not following redirects.
transport := urlfetch.Transport{ transport := urlfetch.Transport{
Context: context, Context: context_,
// Despite the name, Transport.Deadline is really a timeout and // Despite the name, Transport.Deadline is really a timeout and
// not an absolute deadline as used in the net package. In // not an absolute deadline as used in the net package. In
// other words it is a time.Duration, not a time.Time. // other words it is a time.Duration, not a time.Time.
@ -83,7 +85,7 @@ func handler(w http.ResponseWriter, r *http.Request) {
} }
resp, err := transport.RoundTrip(fr) resp, err := transport.RoundTrip(fr)
if err != nil { if err != nil {
context.Errorf("RoundTrip: %s", err) log.Errorf(context_, "RoundTrip: %s", err)
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return return
} }
@ -99,7 +101,7 @@ func handler(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(resp.StatusCode) w.WriteHeader(resp.StatusCode)
n, err := io.Copy(w, resp.Body) n, err := io.Copy(w, resp.Body)
if err != nil { if err != nil {
context.Errorf("io.Copy after %d bytes: %s", n, err) log.Errorf(context_, "io.Copy after %d bytes: %s", n, err)
} }
} }