From 9c09b287d682051198284df298cebb39e4a731b8 Mon Sep 17 00:00:00 2001 From: yangwei999 <348134071@qq.com> Date: Fri, 22 Sep 2023 11:19:42 +0800 Subject: [PATCH 1/2] update log level and fix cron --- cve-vulner-manager/conf/product_app.conf | 4 +-- cve-vulner-manager/task/inittask.go | 44 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/cve-vulner-manager/conf/product_app.conf b/cve-vulner-manager/conf/product_app.conf index 440a252..db697f7 100644 --- a/cve-vulner-manager/conf/product_app.conf +++ b/cve-vulner-manager/conf/product_app.conf @@ -65,7 +65,7 @@ maxconn = 3000 [log] -log_level = 7 +log_level = 5 log_dir = ./logs log_path = logs/cve.log maxlines=20000 @@ -81,7 +81,7 @@ getcve = 0 */40 * * * * oricveflag = 1 oricvecheck = 0 0 2 * * * getissueflag = 1 -getissue = 0 20 1,12 * * * +getissue = 0 20 1 * * * issueflag = 1 createissue = 0 0 6 * * * emergissueflag = 1 diff --git a/cve-vulner-manager/task/inittask.go b/cve-vulner-manager/task/inittask.go index 42e192f..da90453 100644 --- a/cve-vulner-manager/task/inittask.go +++ b/cve-vulner-manager/task/inittask.go @@ -31,12 +31,12 @@ func InitEulerYamlTask(eulergetymal string) { } //InitCveTask Generate cve original data into cve library -func InitCveTask(getCve string) { - logs.Info("The task of generating cve vulnerability library from cve raw data begins...") - CveTask := toolbox.NewTask("ParamsCveOriginData", getCve, ParamsCveOriginData) - toolbox.AddTask("ParamsCveOriginData", CveTask) - logs.Info("The task of generating cve vulnerability library from cve raw data ends...") -} +//func InitCveTask(getCve string) { +// logs.Info("The task of generating cve vulnerability library from cve raw data begins...") +// CveTask := toolbox.NewTask("ParamsCveOriginData", getCve, ParamsCveOriginData) +// toolbox.AddTask("ParamsCveOriginData", CveTask) +// logs.Info("The task of generating cve vulnerability library from cve raw data ends...") +//} // InitIssueTask Get the created issue data source func InitIssueTask(getIssue string) { @@ -63,12 +63,12 @@ func CreatTask(createIssue string) { } // Handle the current emergency cve and create an issue -func EmgCreatTask(emergCreateIssue string) { - logs.Info("Handle the current emergency cve and create an issue task to start...") - cIssueTask := toolbox.NewTask("EmgCreateIssue", emergCreateIssue, EmgCreateIssue) - toolbox.AddTask("EmgCreateIssue", cIssueTask) - logs.Info("Handle the current emergency cve and create an issue to end...") -} +//func EmgCreatTask(emergCreateIssue string) { +// logs.Info("Handle the current emergency cve and create an issue task to start...") +// cIssueTask := toolbox.NewTask("EmgCreateIssue", emergCreateIssue, EmgCreateIssue) +// toolbox.AddTask("EmgCreateIssue", cIssueTask) +// logs.Info("Handle the current emergency cve and create an issue to end...") +//} // unlock table func UnlockTask(unLockTable string) { @@ -239,11 +239,11 @@ func InitTask() bool { InitIssueTask(getissue) } // Generate cve vulnerability library - cveflag, errxs := BConfig.Int("crontab::cveflag") - if cveflag == 1 && errxs == nil { - getcve := BConfig.String("crontab::getcve") - InitCveTask(getcve) - } + //cveflag, errxs := BConfig.Int("crontab::cveflag") + //if cveflag == 1 && errxs == nil { + // getcve := BConfig.String("crontab::getcve") + // InitCveTask(getcve) + //} // Regularly output logs to the console printLogFlag, errxs := BConfig.Int("crontab::printlogflag") if printLogFlag == 1 && errxs == nil { @@ -257,11 +257,11 @@ func InitTask() bool { CreatTask(createIssue) } // Handle the current emergency cve and create an issue - emergissueflag, errx := BConfig.Int("crontab::emergissueflag") - if emergissueflag == 1 && errx == nil { - emergCreateIssue := BConfig.String("crontab::emergcreateissue") - EmgCreatTask(emergCreateIssue) - } + //emergissueflag, errx := BConfig.Int("crontab::emergissueflag") + //if emergissueflag == 1 && errx == nil { + // emergCreateIssue := BConfig.String("crontab::emergcreateissue") + // EmgCreatTask(emergCreateIssue) + //} // Generate excel data from issue genexcelflag, errx := BConfig.Int("crontab::genexcelflag") if genexcelflag == 1 && errx == nil { -- Gitee From 432a5f3c707c8a59eed323bbef17610c9deed99f Mon Sep 17 00:00:00 2001 From: yangwei999 <348134071@qq.com> Date: Fri, 22 Sep 2023 11:40:54 +0800 Subject: [PATCH 2/2] remove it --- cve-vulner-manager/task/inittask.go | 30 ++--------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/cve-vulner-manager/task/inittask.go b/cve-vulner-manager/task/inittask.go index da90453..441c445 100644 --- a/cve-vulner-manager/task/inittask.go +++ b/cve-vulner-manager/task/inittask.go @@ -30,14 +30,6 @@ func InitEulerYamlTask(eulergetymal string) { logs.Info("End of the task of obtaining euleryaml data source...") } -//InitCveTask Generate cve original data into cve library -//func InitCveTask(getCve string) { -// logs.Info("The task of generating cve vulnerability library from cve raw data begins...") -// CveTask := toolbox.NewTask("ParamsCveOriginData", getCve, ParamsCveOriginData) -// toolbox.AddTask("ParamsCveOriginData", CveTask) -// logs.Info("The task of generating cve vulnerability library from cve raw data ends...") -//} - // InitIssueTask Get the created issue data source func InitIssueTask(getIssue string) { logs.Info("Get the created issue data source task starts...") @@ -62,14 +54,6 @@ func CreatTask(createIssue string) { logs.Info("End of execution of the task of creating an issue...") } -// Handle the current emergency cve and create an issue -//func EmgCreatTask(emergCreateIssue string) { -// logs.Info("Handle the current emergency cve and create an issue task to start...") -// cIssueTask := toolbox.NewTask("EmgCreateIssue", emergCreateIssue, EmgCreateIssue) -// toolbox.AddTask("EmgCreateIssue", cIssueTask) -// logs.Info("Handle the current emergency cve and create an issue to end...") -//} - // unlock table func UnlockTask(unLockTable string) { logs.Info("Execute unlock table task start...") @@ -238,12 +222,7 @@ func InitTask() bool { getissue := BConfig.String("crontab::getissue") InitIssueTask(getissue) } - // Generate cve vulnerability library - //cveflag, errxs := BConfig.Int("crontab::cveflag") - //if cveflag == 1 && errxs == nil { - // getcve := BConfig.String("crontab::getcve") - // InitCveTask(getcve) - //} + // Regularly output logs to the console printLogFlag, errxs := BConfig.Int("crontab::printlogflag") if printLogFlag == 1 && errxs == nil { @@ -256,12 +235,7 @@ func InitTask() bool { createIssue := BConfig.String("crontab::createissue") CreatTask(createIssue) } - // Handle the current emergency cve and create an issue - //emergissueflag, errx := BConfig.Int("crontab::emergissueflag") - //if emergissueflag == 1 && errx == nil { - // emergCreateIssue := BConfig.String("crontab::emergcreateissue") - // EmgCreatTask(emergCreateIssue) - //} + // Generate excel data from issue genexcelflag, errx := BConfig.Int("crontab::genexcelflag") if genexcelflag == 1 && errx == nil { -- Gitee