Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions internal/dao/cache_job_dao.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package dao

import (
"fmt"
"strings"

"dingoscheduler/internal/data"
"dingoscheduler/internal/model"
Expand Down Expand Up @@ -111,19 +112,19 @@ func (c *CacheJobDao) RemoteRequestPathsInfo(domain, dataType, org, repo, revisi

func (c *CacheJobDao) UpdateCacheStatus(statusReq *query.UpdateJobStatusReq) error {
var (
msgStr []byte
err error
newMsgStr string
)
if statusReq.ErrorMsg != "" {
msg := make(map[string]string, 0)
msg["msg"] = statusReq.ErrorMsg
msgStr, err = sonic.Marshal(msg)
msgStr, err := sonic.Marshal(msg)
if err != nil {
return err
}
newMsgStr = strings.ReplaceAll(string(msgStr), "'", "''")
}
sql := fmt.Sprintf("UPDATE cache_job SET status = %d, error_msg = '%s', updated_at = '%s' WHERE id = %d",
statusReq.Status, string(msgStr), util.GetCurrentTimeStr(), statusReq.Id)
statusReq.Status, newMsgStr, util.GetCurrentTimeStr(), statusReq.Id)
if err := c.baseData.BizDB.Exec(sql).Error; err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion internal/dao/hf_token_dao.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func (d *HfTokenDao) getDefaultToken() string {
defer d.mu.Unlock()
if d.defaultToken == "" {
var hfTokens []*model.HfToken
if err := d.baseData.BizDB.Table("hf_token t1").Limit(1).Find(&hfTokens).Error; err != nil {
if err := d.baseData.BizDB.Table("hf_token t1").Where("enabled = ?", true).Limit(1).Find(&hfTokens).Error; err != nil {
zap.S().Errorf("getDefaultToken err.%v", err)
return ""
}
Expand Down
3 changes: 2 additions & 1 deletion internal/dao/repository_dao.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ func (r *RepositoryDao) PersistRepo(persistRepoReq *query.PersistRepoReq) error
return err
}
if len(freeRepositories) == 0 {
return myerr.New("没有要持久化的仓库。")
zap.S().Warnf("instanceId:%s 没有要持久化的仓库。", instanceId)
continue
}
speed, err := r.dingospeedDao.GetEntity(instanceId, true)
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions internal/model/hf_token.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.