admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update & clean debug log

Browse Source 
Signed-off-by: soulseen <sunzhu@yunify.com>
This commit is contained in:
soulseen
2019-08-24 14:54:23 +08:00
parent 8aadf7af34
commit 959791ead5
8 changed files with 122 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/models/registries/blob.go
View File

@@ -4,15 +4,16 @@ import (
"encoding/json"
"fmt"
"github.com/docker/distribution/manifest/schema2"
log "github.com/golang/glog"
log "k8s.io/klog"
"net/http"
)
// Digest returns the digest for an image.
func (r *Registry) ImageBlob(image Image, token string) (*ImageBlob, error) {
if image.Path == "" {
return nil, fmt.Errorf("image is required")
}
url := r.GetBlobUrl(image)
log.Info("registry.blobs.get url=" + url)
req, err := http.NewRequest("GET", url, nil)
if err != nil {
@@ -32,14 +33,14 @@ func (r *Registry) ImageBlob(image Image, token string) (*ImageBlob, error) {
respBody, _ := GetRespBody(resp)
if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNotFound {
log.Info("got response: " + string(resp.StatusCode) + string(respBody))
return nil, fmt.Errorf("got response: %s", respBody)
log.Error("got response: " + string(resp.StatusCode) + string(respBody))
return nil, fmt.Errorf("got image blob faild")
}
imageBlob := &ImageBlob{}
json.Unmarshal(respBody, imageBlob)
err = json.Unmarshal(respBody, imageBlob)
return imageBlob, nil
return imageBlob, err
}
func (r *Registry) GetBlobUrl(image Image) string {