|
@@ -118,10 +118,11 @@ func NewPT() *ProjectTask {
|
|
|
|
|
|
//saveSign: make(chan bool, 1),
|
|
|
//updateSign: make(chan bool, 1),
|
|
|
- coll: ProjectColl,
|
|
|
- validTime: int64(util.IntAllDef(config.Conf.Serve.ValidDays, 150)) * 86400,
|
|
|
- statusTime: int64(util.IntAllDef(config.Conf.Serve.StatusDays, 15) * 86400),
|
|
|
- jgTime: int64(util.IntAllDef(7, 7) * 86400),
|
|
|
+ coll: ProjectColl,
|
|
|
+ validTime: int64(util.IntAllDef(config.Conf.Serve.ValidDays, 150)) * 86400,
|
|
|
+ statusTime: int64(util.IntAllDef(config.Conf.Serve.StatusDays, 15) * 86400),
|
|
|
+ jgTime: int64(util.IntAllDef(7, 7) * 86400),
|
|
|
+ currentType: "ql",
|
|
|
}
|
|
|
return p
|
|
|
}
|
|
@@ -170,8 +171,10 @@ func (p *ProjectTask) clearMem() {
|
|
|
// 创建项目的时间大于7天
|
|
|
//在内存中保留最近6个月的信息
|
|
|
//跑全量时每5分钟跑一次,跑增量时400分钟跑一次
|
|
|
- _ = c.AddFunc("50 0/5 * * * *", func() {
|
|
|
+ _ = c.AddFunc("0 0/1 * * * ?", func() {
|
|
|
+ log.Info("1")
|
|
|
if (p.currentType == "ql" && SingleClear == 0) || p.clearContimes >= 80 {
|
|
|
+ log.Info("2")
|
|
|
SingleClear = 1
|
|
|
//跳过的次数清零
|
|
|
p.clearContimes = 0
|
|
@@ -180,6 +183,7 @@ func (p *ProjectTask) clearMem() {
|
|
|
//defer p.findLock.Unlock()
|
|
|
//合并进行的任务都完成
|
|
|
p.wg.Wait()
|
|
|
+ log.Info("3")
|
|
|
//遍历id
|
|
|
//所有内存中的项目信息
|
|
|
p.AllIdsMapLock.Lock()
|