UniqueSoft/swirl
2
0
Fork 0
mirror of https://github.com/cuigh/swirl synced 2025-03-12 06:31:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix linter warnings

Browse Source
This commit is contained in:
cuigh 2018-05-26 14:57:32 +08:00
parent 14b166ea01
commit 8b10ce5964
6 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
biz/docker/stack.go
View File

@ -299,12 +299,12 @@ func createConfigs(ctx context.Context, cli *client.Client, configs []swarm.Conf
case err == nil: case err == nil:
// config already exists, then we update that // config already exists, then we update that
if err = cli.ConfigUpdate(ctx, config.ID, config.Meta.Version, configSpec); err != nil { if err = cli.ConfigUpdate(ctx, config.ID, config.Meta.Version, configSpec); err != nil {
errors.Wrap(err, "failed to update config "+configSpec.Name) return errors.Wrap(err, "failed to update config "+configSpec.Name)
} }
case client.IsErrNotFound(err): case client.IsErrNotFound(err):
// config does not exist, then we create a new one. // config does not exist, then we create a new one.
if _, err = cli.ConfigCreate(ctx, configSpec); err != nil { if _, err = cli.ConfigCreate(ctx, configSpec); err != nil {
errors.Wrap(err, "failed to create config "+configSpec.Name) return errors.Wrap(err, "failed to create config "+configSpec.Name)
} }
default: default:
return err return err

1
biz/event.go
View File

@ -26,7 +26,6 @@ func (b *eventBiz) Create(event *model.Event) {
log.Get("event").Errorf("Create event `%+v` failed: %v", event, err) log.Get("event").Errorf("Create event `%+v` failed: %v", event, err)
} }
}) })
return
} }
func (b *eventBiz) CreateRegistry(action model.EventAction, id, name string, user web.User) { func (b *eventBiz) CreateRegistry(action model.EventAction, id, name string, user web.User) {

1
biz/stack.go
View File

@ -124,5 +124,4 @@ func (b *stackBiz) Migrate() {
do(func(d dao.Interface) { do(func(d dao.Interface) {
d.StackMigrate() d.StackMigrate()
}) })
return
} }

11
dao/bolt/bolt.go
View File

@ -1,7 +1,6 @@
package bolt package bolt
import ( import (
"encoding/binary"
"encoding/json" "encoding/json"
"path/filepath" "path/filepath"
"strings" "strings"
@ -145,8 +144,8 @@ func matchAny(s string, list ...string) bool {
} }
// itob returns an 8-byte big endian representation of v. // itob returns an 8-byte big endian representation of v.
func itob(i uint64) []byte { //func itob(i uint64) []byte {
b := make([]byte, 8) // b := make([]byte, 8)
binary.BigEndian.PutUint64(b, i) // binary.BigEndian.PutUint64(b, i)
return b // return b
} //}

1
dao/mongo/chart.go
View File

@ -39,7 +39,6 @@ func (d *Dao) ChartBatch(names ...string) (charts []*model.Chart, err error) {
q := bson.M{"_id": bson.M{"$in": names}} q := bson.M{"_id": bson.M{"$in": names}}
charts = make([]*model.Chart, 0) charts = make([]*model.Chart, 0)
err = db.C("chart").Find(q).All(&charts) err = db.C("chart").Find(q).All(&charts)
return
}) })
return return
} }

15
scaler/scaler.go
View File

@ -101,16 +101,23 @@ func tryScale(service *swarm.Service, opts data.Options) {
return return
} }
logger := log.Get("scaler")
replicas := *service.Spec.Mode.Replicated.Replicas replicas := *service.Spec.Mode.Replicated.Replicas
if result.Type == scaleUp { if result.Type == scaleUp {
if replicas < max { if replicas < max {
docker.ServiceScale(service.Spec.Name, service.Version.Index, replicas+step) if err := docker.ServiceScale(service.Spec.Name, service.Version.Index, replicas+step); err != nil {
log.Get("scaler").Infof("scaler > Service '%s' scaled up for: %v", service.Spec.Name, result.Reasons) logger.Errorf("scaler > Failed to scale service '%s': %v", service.Spec.Name, err)
} else {
logger.Infof("scaler > Service '%s' scaled up for: %v", service.Spec.Name, result.Reasons)
}
} }
} else if result.Type == scaleDown { } else if result.Type == scaleDown {
if replicas > min { if replicas > min {
docker.ServiceScale(service.Spec.Name, service.Version.Index, replicas-step) if err := docker.ServiceScale(service.Spec.Name, service.Version.Index, replicas-step); err != nil {
log.Get("scaler").Infof("scaler > Service '%s' scaled down for: %v", service.Spec.Name, result.Reasons) logger.Errorf("scaler > Failed to scale service '%s': %v", service.Spec.Name, err)
} else {
logger.Infof("scaler > Service '%s' scaled down for: %v", service.Spec.Name, result.Reasons)
}
} }
} }
} }