Commit dccfaf2d by Li Feifei

减少无效日志打印

parent 15597eed
Pipeline #15690 passed with stages
in 33 seconds
...@@ -130,8 +130,6 @@ func (f *ObtainFile) taskJob(file *zip.File) ([]interface{}, error) { ...@@ -130,8 +130,6 @@ func (f *ObtainFile) taskJob(file *zip.File) ([]interface{}, error) {
info := img.Bounds() info := img.Bounds()
imageInfo := []interface{}{replaceName, info.Max.X, info.Max.Y} imageInfo := []interface{}{replaceName, info.Max.X, info.Max.Y}
g.Log().Async().Infof("Upload picture file: %s Success", replaceName)
return imageInfo, oss.Upload(f.parser.splitUploadPath()+"images/"+replaceName, fileReader) return imageInfo, oss.Upload(f.parser.splitUploadPath()+"images/"+replaceName, fileReader)
} }
...@@ -159,6 +157,7 @@ func (f *ObtainFile) uploadPicture() error { ...@@ -159,6 +157,7 @@ func (f *ObtainFile) uploadPicture() error {
defer reader.Close() defer reader.Close()
pool := workpool.New(100) pool := workpool.New(100)
for _, file := range reader.File { for _, file := range reader.File {
pool.DoWait(func() error { pool.DoWait(func() error {
return f.task(file) return f.task(file)
...@@ -189,9 +188,9 @@ func (f *ObtainFile) Worker(err error) { ...@@ -189,9 +188,9 @@ func (f *ObtainFile) Worker(err error) {
if err != nil { if err != nil {
g.Log().Async().Error(err) g.Log().Async().Error(err)
f.err <- err f.err <- err
} else { return
f.ok <- true
} }
f.ok <- true
}() }()
if err != nil { if err != nil {
return return
...@@ -200,23 +199,25 @@ func (f *ObtainFile) Worker(err error) { ...@@ -200,23 +199,25 @@ func (f *ObtainFile) Worker(err error) {
if err = f.fileInfo(); err != nil { if err = f.fileInfo(); err != nil {
return return
} }
g.Log().Async().Infof("file: %s file info complete", f.parser.name) g.Log().Async().Infof("[1] file: %s file info complete", f.parser.name)
// 下载ZIP包 // 下载ZIP包
if err = http.Download(f.splitDownloadLink(), f.parser.splitTempZipLink()); err != nil { if err = http.Download(f.splitDownloadLink(), f.parser.splitTempZipLink()); err != nil {
return return
} }
g.Log().Async().Infof("file: %s Zip Donwload Complete", f.parser.filename()) g.Log().Async().Infof("[2] file: %s Zip Donwload Complete", f.parser.filename())
// 解析ZIP包并上传图片到OSS // 解析ZIP包并上传图片到OSS
if err = f.uploadPicture(); err != nil { if err = f.uploadPicture(); err != nil {
return return
} }
g.Log().Async().Infof("[3] picture upload oss success")
// 上传packed.json到oss // 上传packed.json到oss
if err = f.uploadPacked(); err != nil { if err = f.uploadPacked(); err != nil {
return return
} }
g.Log().Async().Infof("filename: %s upload success!", f.parser.name) g.Log().Async().Infof("[4] filename: %s upload success!", f.parser.name)
} }
func (f *ObtainFile) FileName() string { func (f *ObtainFile) FileName() string {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment