Merge pull request #1543 from MetalMatze/pr/gofmt

Use gofmt to fmt & simplify
This commit is contained in:
Brad Rydzewski 2016-03-27 12:19:02 -07:00
commit d3c1ba1254
5 changed files with 12 additions and 12 deletions

View file

@ -93,7 +93,7 @@ func GetStream(c *gin.Context) {
go func() { go func() {
defer func() { defer func() {
recover() recover()
}() }()
<-c.Writer.CloseNotify() <-c.Writer.CloseNotify()
rc.Close() rc.Close()

View file

@ -305,7 +305,7 @@ func (e *engine) runJob(c context.Context, r *Task, updater *updater, client doc
MemorySwappiness: -1, MemorySwappiness: -1,
}, },
Volumes: map[string]struct{}{ Volumes: map[string]struct{}{
"/var/run/docker.sock": struct{}{}, "/var/run/docker.sock": {},
}, },
} }
@ -415,7 +415,7 @@ func (e *engine) runJobNotify(r *Task, client dockerclient.Client) error {
MemorySwappiness: -1, MemorySwappiness: -1,
}, },
Volumes: map[string]struct{}{ Volumes: map[string]struct{}{
"/var/run/docker.sock": struct{}{}, "/var/run/docker.sock": {},
}, },
} }

View file

@ -54,7 +54,7 @@ func (w *worker) Build(name string, stdin []byte, pr bool) (_ int, err error) {
Binds: []string{"/var/run/docker.sock:/var/run/docker.sock"}, Binds: []string{"/var/run/docker.sock:/var/run/docker.sock"},
}, },
Volumes: map[string]struct{}{ Volumes: map[string]struct{}{
"/var/run/docker.sock": struct{}{}, "/var/run/docker.sock": {},
}, },
} }

View file

@ -22,11 +22,11 @@ type AccountResp struct {
} }
type BuildStatus struct { type BuildStatus struct {
State string `json:"state"` State string `json:"state"`
Key string `json:"key"` Key string `json:"key"`
Name string `json:"name,omitempty"` Name string `json:"name,omitempty"`
Url string `json:"url"` Url string `json:"url"`
Desc string `json:"description,omitempty"` Desc string `json:"description,omitempty"`
} }
type Email struct { type Email struct {

View file

@ -86,19 +86,19 @@ func TestJobs(t *testing.T) {
Status: model.StatusSuccess, Status: model.StatusSuccess,
} }
jobs := []*model.Job{ jobs := []*model.Job{
&model.Job{ {
BuildID: 1, BuildID: 1,
Status: "success", Status: "success",
ExitCode: 0, ExitCode: 0,
Number: 1, Number: 1,
}, },
&model.Job{ {
BuildID: 3, BuildID: 3,
Status: "error", Status: "error",
ExitCode: 1, ExitCode: 1,
Number: 2, Number: 2,
}, },
&model.Job{ {
BuildID: 5, BuildID: 5,
Status: "pending", Status: "pending",
ExitCode: 0, ExitCode: 0,