diff --git a/biz/docker/stack.go b/biz/docker/stack.go index efc5f92..cab02ee 100644 --- a/biz/docker/stack.go +++ b/biz/docker/stack.go @@ -299,12 +299,12 @@ func createConfigs(ctx context.Context, cli *client.Client, configs []swarm.Conf case err == nil: // config already exists, then we update that 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): // config does not exist, then we create a new one. 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: return err diff --git a/biz/event.go b/biz/event.go index 34af456..872bfc6 100644 --- a/biz/event.go +++ b/biz/event.go @@ -26,7 +26,6 @@ func (b *eventBiz) Create(event *model.Event) { 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) { diff --git a/biz/stack.go b/biz/stack.go index 7675e4a..3bcbbb8 100644 --- a/biz/stack.go +++ b/biz/stack.go @@ -124,5 +124,4 @@ func (b *stackBiz) Migrate() { do(func(d dao.Interface) { d.StackMigrate() }) - return } diff --git a/dao/bolt/bolt.go b/dao/bolt/bolt.go index 3b258b5..a671182 100644 --- a/dao/bolt/bolt.go +++ b/dao/bolt/bolt.go @@ -1,7 +1,6 @@ package bolt import ( - "encoding/binary" "encoding/json" "path/filepath" "strings" @@ -145,8 +144,8 @@ func matchAny(s string, list ...string) bool { } // itob returns an 8-byte big endian representation of v. -func itob(i uint64) []byte { - b := make([]byte, 8) - binary.BigEndian.PutUint64(b, i) - return b -} +//func itob(i uint64) []byte { +// b := make([]byte, 8) +// binary.BigEndian.PutUint64(b, i) +// return b +//} diff --git a/dao/mongo/chart.go b/dao/mongo/chart.go index 4e4d671..0d79a2d 100644 --- a/dao/mongo/chart.go +++ b/dao/mongo/chart.go @@ -39,7 +39,6 @@ func (d *Dao) ChartBatch(names ...string) (charts []*model.Chart, err error) { q := bson.M{"_id": bson.M{"$in": names}} charts = make([]*model.Chart, 0) err = db.C("chart").Find(q).All(&charts) - return }) return } diff --git a/scaler/scaler.go b/scaler/scaler.go index 7ee70f2..1abd079 100644 --- a/scaler/scaler.go +++ b/scaler/scaler.go @@ -101,16 +101,23 @@ func tryScale(service *swarm.Service, opts data.Options) { return } + logger := log.Get("scaler") replicas := *service.Spec.Mode.Replicated.Replicas if result.Type == scaleUp { if replicas < max { - docker.ServiceScale(service.Spec.Name, service.Version.Index, replicas+step) - log.Get("scaler").Infof("scaler > Service '%s' scaled up for: %v", service.Spec.Name, result.Reasons) + if err := docker.ServiceScale(service.Spec.Name, service.Version.Index, replicas+step); err != nil { + 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 { if replicas > min { - docker.ServiceScale(service.Spec.Name, service.Version.Index, replicas-step) - log.Get("scaler").Infof("scaler > Service '%s' scaled down for: %v", service.Spec.Name, result.Reasons) + if err := docker.ServiceScale(service.Spec.Name, service.Version.Index, replicas-step); err != nil { + 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) + } } } }