diff --git a/lib/go/camli/client/upload.go b/lib/go/camli/client/upload.go index 2df8ee31f..3c3d629d7 100644 --- a/lib/go/camli/client/upload.go +++ b/lib/go/camli/client/upload.go @@ -217,7 +217,7 @@ func (c *Client) Stat(dest chan<- blobref.SizedBlobRef, blobs []*blobref.BlobRef } func (c *Client) Upload(h *UploadHandle) (*PutResult, os.Error) { - error := func(msg string, arg ...interface{}) (*PutResult, os.Error) { + errorf := func(msg string, arg ...interface{}) (*PutResult, os.Error) { err := fmt.Errorf(msg, arg...) c.log.Print(err.String()) return nil, err @@ -244,11 +244,11 @@ func (c *Client) Upload(h *UploadHandle) (*PutResult, os.Error) { resp, err := c.httpClient.Do(req) if err != nil { - return error("stat http error: %v", err) + return errorf("stat http error: %v", err) } if resp.StatusCode != 200 { - return error("stat response had http status %d", resp.StatusCode) + return errorf("stat response had http status %d", resp.StatusCode) } stat, err := parseStatResponse(resp.Body) @@ -311,39 +311,39 @@ func (c *Client) Upload(h *UploadHandle) (*PutResult, os.Error) { req.TransferEncoding = nil resp, err = c.httpClient.Do(req) if err != nil { - return error("upload http error: %v", err) + return errorf("upload http error: %v", err) } // check error from earlier copy if err := <-copyResult; err != nil { - return error("failed to copy contents into multipart writer: %v", err) + return errorf("failed to copy contents into multipart writer: %v", err) } // The only valid HTTP responses are 200 and 303. if resp.StatusCode != 200 && resp.StatusCode != 303 { - return error("invalid http response %d in upload response", resp.StatusCode) + return errorf("invalid http response %d in upload response", resp.StatusCode) } if resp.StatusCode == 303 { otherLocation := resp.Header.Get("Location") if otherLocation == "" { - return error("303 without a Location") + return errorf("303 without a Location") } baseUrl, _ := http.ParseURL(stat.uploadUrl) absUrl, err := baseUrl.ParseURL(otherLocation) if err != nil { - return error("303 Location URL relative resolve error: %v", err) + return errorf("303 Location URL relative resolve error: %v", err) } otherLocation = absUrl.String() resp, err = http.Get(otherLocation) if err != nil { - return error("error following 303 redirect after upload: %v", err) + return errorf("error following 303 redirect after upload: %v", err) } } ures, err := c.jsonFromResponse("upload", resp) if err != nil { - return error("json parse from upload error: %v", err) + return errorf("json parse from upload error: %v", err) } errorText, ok := ures["errorText"].(string) @@ -353,18 +353,18 @@ func (c *Client) Upload(h *UploadHandle) (*PutResult, os.Error) { received, ok := ures["received"].([]interface{}) if !ok { - return error("upload json validity error: no 'received'") + return errorf("upload json validity error: no 'received'") } for _, rit := range received { it, ok := rit.(map[string]interface{}) if !ok { - return error("upload json validity error: 'received' is malformed") + return errorf("upload json validity error: 'received' is malformed") } if it["blobRef"] == blobRefString { switch size := it["size"].(type) { case nil: - return error("upload json validity error: 'received' is missing 'size'") + return errorf("upload json validity error: 'received' is missing 'size'") case float64: if int64(size) == h.Size { // Success! @@ -374,11 +374,11 @@ func (c *Client) Upload(h *UploadHandle) (*PutResult, os.Error) { c.statsMutex.Unlock() return pr, nil } else { - return error("Server got blob, but reports wrong length (%v; expected %d)", + return errorf("Server got blob, but reports wrong length (%v; expected %d)", size, h.Size) } default: - return error("unsupported type of 'size' in received response") + return errorf("unsupported type of 'size' in received response") } } } diff --git a/lib/go/camli/netutil/ident.go b/lib/go/camli/netutil/ident.go index 4b40e4f8b..95ce0ba87 100644 --- a/lib/go/camli/netutil/ident.go +++ b/lib/go/camli/netutil/ident.go @@ -38,7 +38,7 @@ func ConnUserid(conn net.Conn) (uid int, err os.Error) { func splitIPPort(param, value string) (ip net.IP, port int, reterr os.Error) { addrs, ports, err := net.SplitHostPort(value) if err != nil { - reterr = fmt.Errorf("netutil: AddrPairUserid invalid %s value: %v", err) + reterr = fmt.Errorf("netutil: AddrPairUserid invalid %s value: %v", param, err) return } ip = net.ParseIP(addrs) diff --git a/server/go/camlistored/sync.go b/server/go/camlistored/sync.go index 272a7a056..2824e6bf2 100644 --- a/server/go/camlistored/sync.go +++ b/server/go/camlistored/sync.go @@ -227,7 +227,7 @@ func (sh *SyncHandler) syncQueueLoop() { } if err := <-errch; err != nil { - sh.addErrorToLog(fmt.Errorf("replication error for queue %q, enumerate from source: %v", err)) + sh.addErrorToLog(fmt.Errorf("replication error for queue %q, enumerate from source: %v", sh.fromqName, err)) return } if nCopied > 0 { @@ -263,7 +263,7 @@ func (sh *SyncHandler) copyBlob(sb blobref.SizedBlobRef) os.Error { } defer set(nil) - error := func(s string, args ...interface{}) os.Error { + errorf := func(s string, args ...interface{}) os.Error { // TODO: increment error stats pargs := []interface{}{sh.fromqName, sb.BlobRef} pargs = append(pargs, args...) @@ -275,10 +275,10 @@ func (sh *SyncHandler) copyBlob(sb blobref.SizedBlobRef) os.Error { set(status("sending GET to source")) blobReader, fromSize, err := sh.from.FetchStreaming(sb.BlobRef) if err != nil { - return error("source fetch: %v", err) + return errorf("source fetch: %v", err) } if fromSize != sb.Size { - return error("source fetch size mismatch: get=%d, enumerate=%d", fromSize, sb.Size) + return errorf("source fetch size mismatch: get=%d, enumerate=%d", fromSize, sb.Size) } bytesCopied := int64(0) // accessed without locking; minor, just for status display @@ -287,15 +287,15 @@ func (sh *SyncHandler) copyBlob(sb blobref.SizedBlobRef) os.Error { })) newsb, err := sh.to.ReceiveBlob(sb.BlobRef, misc.CountingReader{blobReader, &bytesCopied}) if err != nil { - return error("dest write: %v", err) + return errorf("dest write: %v", err) } if newsb.Size != sb.Size { - return error("write size mismatch: source_read=%d but dest_write=%d", sb.Size, newsb.Size) + return errorf("write size mismatch: source_read=%d but dest_write=%d", sb.Size, newsb.Size) } set(status("copied; removing from queue")) err = sh.fromq.Remove([]*blobref.BlobRef{sb.BlobRef}) if err != nil { - return error("source queue delete: %v", err) + return errorf("source queue delete: %v", err) } return nil }