alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #356 from fnproject/oom-err

Browse Source 
improve ux for ooms
This commit is contained in:
Reed Allman
2017-09-25 11:03:43 -07:00
committed by GitHub
parent fff03d370f b3157401e8
commit bb7e600053
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/agent/drivers/docker/docker.go
View File

@@ -460,6 +460,7 @@ func (drv *DockerDriver) wait(ctx context.Context, container string) (status str
case 137: // OOM case 137: // OOM
// TODO put in stats opentracing.SpanFromContext(ctx).LogFields(log.String("docker", "oom")) // TODO put in stats opentracing.SpanFromContext(ctx).LogFields(log.String("docker", "oom"))
common.Logger(ctx).Error("docker oom") common.Logger(ctx).Error("docker oom")
return drivers.StatusKilled, models.NewAPIError(http.StatusBadGateway, errors.New("container out of memory")) err := errors.New("container out of memory, you may want to raise route.memory for this route (default: 128MB)")
return drivers.StatusKilled, models.NewAPIError(http.StatusBadGateway, err)
} }
} }