From ea6f169ba13c1d4a58120163b4df6c2380e16963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Thu, 24 Aug 2023 03:12:08 +0800 Subject: [PATCH] fix(logger): export limit (#17825) --- pkg/cloudcommon/db/db_dispatcher.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/cloudcommon/db/db_dispatcher.go b/pkg/cloudcommon/db/db_dispatcher.go index cb94e845f8..7de6e2cfb8 100644 --- a/pkg/cloudcommon/db/db_dispatcher.go +++ b/pkg/cloudcommon/db/db_dispatcher.go @@ -573,6 +573,12 @@ func ListItems(manager IModelManager, ctx context.Context, userCred mcclient.Tok pagingOrderStr, _ := query.GetString("paging_order") pagingOrder := sqlchemy.QueryOrderType(strings.ToUpper(pagingOrderStr)) + // export data only + exportLimit, err := query.Int("export_limit") + if query.Contains("export_keys") && err == nil { + limit = exportLimit + } + var ( q *sqlchemy.SQuery useRawQuery bool @@ -703,12 +709,6 @@ func ListItems(manager IModelManager, ctx context.Context, userCred mcclient.Tok limit = maxLimit } - // export data only - exportLimit, err := query.Int("export_limit") - if query.Contains("export_keys") && err == nil { - limit = exportLimit - } - // orders defined in pagingConf should have the highest priority if pagingConf != nil { for _, f := range pagingConf.MarkerFields {