Skip to content

Commit 332fe3c

Browse files
committed
refactor: code optimize
1 parent 76f83d1 commit 332fe3c

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

internal/controller/minerset/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ func (r *Reconciler) createMiners(ctx context.Context, ms *v1beta1.MinerSet, con
775775
eg.Go(func() error {
776776
select {
777777
case <-ctx.Done():
778-
return nil
778+
return ctx.Err()
779779
default:
780780
miner := r.computeDesiredMiner(ms, nil)
781781

internal/fakeserver/biz/order/order.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func (b *orderBiz) List(ctx context.Context, rq *v1.ListOrderRequest) (*v1.ListO
9393
eg.Go(func() error {
9494
select {
9595
case <-ctx.Done():
96-
return nil
96+
return ctx.Err()
9797
default:
9898
var o v1.OrderReply
9999
_ = copier.Copy(&o, order)

internal/usercenter/biz/user/list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func (b *userBiz) List(ctx context.Context, rq *v1.ListUserRequest) (*v1.ListUse
3434
eg.Go(func() error {
3535
select {
3636
case <-ctx.Done():
37-
return nil
37+
return ctx.Err()
3838
default:
3939
count, _, err := b.ds.Secrets().List(ctx, user.UserID)
4040
if err != nil {

internal/usercenter/store/secret.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (d *secretStore) List(ctx context.Context, userID string, opts ...meta.List
9090
Not("name", known.TemporaryKeyName).
9191
Where(o.Filters).
9292
Offset(o.Offset).
93-
Limit(defaultLimit(o.Limit)).
93+
Limit(o.Limit).
9494
Order("id desc").
9595
Find(&ret).
9696
Offset(-1).

internal/usercenter/store/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (d *userStore) List(ctx context.Context, opts ...meta.ListOption) (count in
6565
ans := d.db(ctx).
6666
Where(o.Filters).
6767
Offset(o.Offset).
68-
Limit(defaultLimit(o.Limit)).
68+
Limit(o.Limit).
6969
Order("id desc").
7070
Find(&ret).
7171
Offset(-1).

0 commit comments

Comments
 (0)