gitreceive: Persist slugbuilder limit across deploys

Before this patch, doing a `git push` deploy would remove the slugbuilder process type from the release, removing any custom per-app limits. Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
flynn · Oct 15, 2016 · ee9c4b6 · ee9c4b6
1 parent 90de16e
commit ee9c4b6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/gitreceive/receiver/flynn-receive.go b/gitreceive/receiver/flynn-receive.go
@@ -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 {

diff --git a/test/test_gitreceive.go b/test/test_gitreceive.go
@@ -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)
 }