Skip to content
This repository has been archived by the owner on Sep 4, 2021. It is now read-only.

gitreceive: Persist slugbuilder limit across deploys #3508

Merged
merged 1 commit into from Oct 15, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions gitreceive/receiver/flynn-receive.go
Expand Up @@ -221,6 +221,9 @@ Options:
}
procs[t] = proc
}
if sb, ok := prevRelease.Processes["slugbuilder"]; ok {
procs["slugbuilder"] = sb
}
release.Processes = procs

if err := client.CreateRelease(release); err != nil {
Expand Down
4 changes: 4 additions & 0 deletions test/test_gitreceive.go
Expand Up @@ -55,6 +55,10 @@ func (s *GitreceiveSuite) TestSlugbuilderLimit(t *c.C) {
t.Assert(push, Succeeds)
t.Assert(push, OutputContains, "524288000")

limit := r.flynn("limit")
t.Assert(limit, Succeeds)
t.Assert(limit.Output, Matches, "slugbuilder:.+memory=500MB")

t.Assert(r.flynn("-a", "gitreceive", "env", "unset", "SLUGBUILDER_DEFAULT_MEMORY_LIMIT"), Succeeds)
}

Expand Down