Prechádzať zdrojové kódy

Merge pull request #2400 from dotcloud/remove_newline_debugf

Removes \n from debugf calls
Victor Vieux 11 rokov pred
rodič
commit
54d3b4dd28
3 zmenil súbory, kde vykonal 6 pridanie a 6 odobranie
  1. 2 2
      commands_test.go
  2. 2 2
      image.go
  3. 2 2
      registry/registry.go

+ 2 - 2
commands_test.go

@@ -304,7 +304,7 @@ func TestRunDisconnectTty(t *testing.T) {
 		// We're simulating a disconnect so the return value doesn't matter. What matters is the
 		// We're simulating a disconnect so the return value doesn't matter. What matters is the
 		// fact that CmdRun returns.
 		// fact that CmdRun returns.
 		if err := cli.CmdRun("-i", "-t", unitTestImageID, "/bin/cat"); err != nil {
 		if err := cli.CmdRun("-i", "-t", unitTestImageID, "/bin/cat"); err != nil {
-			utils.Debugf("Error CmdRun: %s\n", err)
+			utils.Debugf("Error CmdRun: %s", err)
 		}
 		}
 
 
 		close(c1)
 		close(c1)
@@ -549,7 +549,7 @@ func TestAttachDisconnect(t *testing.T) {
 	go func() {
 	go func() {
 		// Start a process in daemon mode
 		// Start a process in daemon mode
 		if err := cli.CmdRun("-d", "-i", unitTestImageID, "/bin/cat"); err != nil {
 		if err := cli.CmdRun("-d", "-i", unitTestImageID, "/bin/cat"); err != nil {
-			utils.Debugf("Error CmdRun: %s\n", err)
+			utils.Debugf("Error CmdRun: %s", err)
 		}
 		}
 	}()
 	}()
 
 

+ 2 - 2
image.go

@@ -92,7 +92,7 @@ func StoreImage(img *Image, jsonData []byte, layerData Archive, root string) err
 		if err := Untar(layerData, layer); err != nil {
 		if err := Untar(layerData, layer); err != nil {
 			return err
 			return err
 		}
 		}
-		utils.Debugf("Untar time: %vs\n", time.Now().Sub(start).Seconds())
+		utils.Debugf("Untar time: %vs", time.Now().Sub(start).Seconds())
 	}
 	}
 
 
 	// If raw json is provided, then use it
 	// If raw json is provided, then use it
@@ -335,7 +335,7 @@ func (img *Image) getParentsSize(size int64) int64 {
 func NewImgJSON(src []byte) (*Image, error) {
 func NewImgJSON(src []byte) (*Image, error) {
 	ret := &Image{}
 	ret := &Image{}
 
 
-	utils.Debugf("Json string: {%s}\n", src)
+	utils.Debugf("Json string: {%s}", src)
 	// FIXME: Is there a cleaner way to "purify" the input json?
 	// FIXME: Is there a cleaner way to "purify" the input json?
 	if err := json.Unmarshal(src, ret); err != nil {
 	if err := json.Unmarshal(src, ret); err != nil {
 		return nil, err
 		return nil, err

+ 2 - 2
registry/registry.go

@@ -499,7 +499,7 @@ func (r *Registry) PushImageJSONIndex(indexEp, remote string, imgList []*ImgData
 	}
 	}
 	u := fmt.Sprintf("%srepositories/%s/%s", indexEp, remote, suffix)
 	u := fmt.Sprintf("%srepositories/%s/%s", indexEp, remote, suffix)
 	utils.Debugf("[registry] PUT %s", u)
 	utils.Debugf("[registry] PUT %s", u)
-	utils.Debugf("Image list pushed to index:\n%s\n", imgListJSON)
+	utils.Debugf("Image list pushed to index:\n%s", imgListJSON)
 	req, err := r.reqFactory.NewRequest("PUT", u, bytes.NewReader(imgListJSON))
 	req, err := r.reqFactory.NewRequest("PUT", u, bytes.NewReader(imgListJSON))
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err
@@ -520,7 +520,7 @@ func (r *Registry) PushImageJSONIndex(indexEp, remote string, imgList []*ImgData
 
 
 	// Redirect if necessary
 	// Redirect if necessary
 	for res.StatusCode >= 300 && res.StatusCode < 400 {
 	for res.StatusCode >= 300 && res.StatusCode < 400 {
-		utils.Debugf("Redirected to %s\n", res.Header.Get("Location"))
+		utils.Debugf("Redirected to %s", res.Header.Get("Location"))
 		req, err = r.reqFactory.NewRequest("PUT", res.Header.Get("Location"), bytes.NewReader(imgListJSON))
 		req, err = r.reqFactory.NewRequest("PUT", res.Header.Get("Location"), bytes.NewReader(imgListJSON))
 		if err != nil {
 		if err != nil {
 			return nil, err
 			return nil, err