Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix to close opened io resources as soon as not needed #8839

Merged
merged 3 commits into from
Nov 5, 2019
Merged

Fix to close opened io resources as soon as not needed #8839

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a88f500
Fix to close opened io resources as soon as not needed
lafriks Nov 5, 2019
12e5d62
Remove unneeded err checks
lafriks Nov 5, 2019
8b3b724
Merge branch 'master' into fix/migrate_closing_io
lafriks Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 44 additions & 33 deletions modules/migrations/gitea.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,27 +252,32 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
}

// download attachment
resp, err := http.Get(asset.URL)
if err != nil {
return err
}
defer resp.Body.Close()
err = func() error {
resp, err := http.Get(asset.URL)
if err != nil {
return err
}
defer resp.Body.Close()

localPath := attach.LocalPath()
if err = os.MkdirAll(path.Dir(localPath), os.ModePerm); err != nil {
return fmt.Errorf("MkdirAll: %v", err)
}
localPath := attach.LocalPath()
if err = os.MkdirAll(path.Dir(localPath), os.ModePerm); err != nil {
return fmt.Errorf("MkdirAll: %v", err)
}

fw, err := os.Create(localPath)
if err != nil {
return fmt.Errorf("Create: %v", err)
}
defer fw.Close()
fw, err := os.Create(localPath)
if err != nil {
return fmt.Errorf("Create: %v", err)
}
defer fw.Close()

if _, err := io.Copy(fw, resp.Body); err != nil {
if _, err := io.Copy(fw, resp.Body); err != nil {
return err
lafriks marked this conversation as resolved.
Show resolved Hide resolved
}
return nil
}()
if err != nil {
return err
}

rel.Attachments = append(rel.Attachments, &attach)
}

Expand Down Expand Up @@ -468,21 +473,27 @@ func (g *GiteaLocalUploader) newPullRequest(pr *base.PullRequest) (*models.PullR
}

// download patch file
resp, err := http.Get(pr.PatchURL)
if err != nil {
return nil, err
}
defer resp.Body.Close()
pullDir := filepath.Join(g.repo.RepoPath(), "pulls")
if err = os.MkdirAll(pullDir, os.ModePerm); err != nil {
return nil, err
}
f, err := os.Create(filepath.Join(pullDir, fmt.Sprintf("%d.patch", pr.Number)))
if err != nil {
return nil, err
}
defer f.Close()
_, err = io.Copy(f, resp.Body)
err := func() error {
resp, err := http.Get(pr.PatchURL)
if err != nil {
return err
}
defer resp.Body.Close()
pullDir := filepath.Join(g.repo.RepoPath(), "pulls")
if err = os.MkdirAll(pullDir, os.ModePerm); err != nil {
return err
}
f, err := os.Create(filepath.Join(pullDir, fmt.Sprintf("%d.patch", pr.Number)))
if err != nil {
return err
}
defer f.Close()
_, err = io.Copy(f, resp.Body)
if err != nil {
lafriks marked this conversation as resolved.
Show resolved Hide resolved
return err
}
return nil
}()
if err != nil {
return nil, err
}
Expand All @@ -496,8 +507,8 @@ func (g *GiteaLocalUploader) newPullRequest(pr *base.PullRequest) (*models.PullR
if err != nil {
return nil, err
}
defer p.Close()
_, err = p.WriteString(pr.Head.SHA)
p.Close()
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -531,8 +542,8 @@ func (g *GiteaLocalUploader) newPullRequest(pr *base.PullRequest) (*models.PullR
if err != nil {
return nil, err
}
defer b.Close()
_, err = b.WriteString(pr.Head.SHA)
b.Close()
if err != nil {
return nil, err
}
Expand Down