Merge pull request #1201 from PapaPiya/configurable_path

[PDR-16096][fix]: logkit 多个关键目录无法自定义配置存储路径

Author: redHJ

mgr/dataflow.go

@@ -56,8 +56,11 @@ func RawData(readerConfig conf.MapConf) ([]string, error) {
 	if rawDataTimeOut < 10 || rawDataTimeOut > 300 {
 		rawDataTimeOut = DefaultRawDataTimeout
 	}
-	configMetaPath := runnerName + "_" + Hash(strconv.FormatInt(time.Now().Unix(), 10))
-	metaPath := filepath.Join(MetaTmp, configMetaPath)
+	metaPath, _ := readerConfig.GetString(config.KeyMetaTmpPath)
+	if metaPath == "" {
+		configMetaPath := runnerName + "_" + Hash(strconv.FormatInt(time.Now().Unix(), 10))
+		metaPath = filepath.Join(MetaTmp, configMetaPath)
+	}
 	log.Debugf("Runner[%v] Using %s as default metaPath", runnerName, metaPath)
 	readerConfig[config.KeyMetaPath] = metaPath
 	size, _ := readerConfig.GetIntOr("raw_data_lines", DefaultRawDataBatchLen)

reader/config/models.go

@@ -14,6 +14,7 @@ const (
 	KeyLogPath           = "log_path"
 	KeyLogPathOld        = "log_path_old"
 	KeyMetaPath          = "meta_path"
+	KeyMetaTmpPath       = "meta_tmp_path"
 	KeyFileDone          = "file_done"
 	KeyMode              = "mode"
 	KeyBufSize           = "reader_buf_size"

reader/meta.go

@@ -850,6 +850,18 @@ func GetLogPathAbs(conf conf.MapConf) (logpath, oldLogPath string, err error) {
 	return logpath, oldLogPath, err
 }
 
+func SetMetaPath(conf conf.MapConf, runnerName, metaDir string) {
+	if metaDir == "" {
+		return
+	}
+	logPath, _ := conf.GetStringOr(KeyLogPath, "")
+	if logPath != "" {
+		logPath = filepath.Base(logPath)
+	}
+	metaPath := filepath.Join(metaDir, fmt.Sprintf("%s_%s", runnerName, Hash(logPath)))
+	conf[KeyMetaPath] = metaPath
+}
+
 func GetMetaOption(conf conf.MapConf) (string, string, string, error) {
 	mode, _ := conf.GetStringOr(KeyMode, ModeDir)
 	logPath, oldLogPath, err := GetLogPathAbs(conf)