CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(inputs.directory_monitor): allow cross filesystem directories (#12124) 

fixes: #12121
This commit is contained in:
Joshua Powers 2022-11-01 06:42:03 -06:00 committed by GitHub
parent a536764bf1
commit 09d5a9c8b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/inputs/directory_monitor/directory_monitor.go
View File

@ -321,18 +321,36 @@ func (monitor *DirectoryMonitor) sendMetrics(metrics []telegraf.Metric) error {
return nil return nil
} }
func (monitor *DirectoryMonitor) moveFile(filePath string, directory string) { func (monitor *DirectoryMonitor) moveFile(srcPath string, dstBaseDir string) {
basePath := strings.Replace(filePath, monitor.Directory, "", 1) // Appends any subdirectories in the srcPath to the dstBaseDir and
newPath := filepath.Join(directory, basePath) // creates those subdirectories.
basePath := strings.Replace(srcPath, monitor.Directory, "", 1)
err := os.MkdirAll(filepath.Dir(newPath), os.ModePerm) dstPath := filepath.Join(dstBaseDir, basePath)
err := os.MkdirAll(filepath.Dir(dstPath), os.ModePerm)
if err != nil { if err != nil {
monitor.Log.Errorf("Error creating directory hierachy for " + filePath + ". Error: " + err.Error()) monitor.Log.Errorf("Error creating directory hierachy for " + srcPath + ". Error: " + err.Error())
} }
err = os.Rename(filePath, newPath) inputFile, err := os.Open(srcPath)
if err != nil { if err != nil {
monitor.Log.Errorf("Error while moving file '" + filePath + "' to another directory. Error: " + err.Error()) monitor.Log.Errorf("Could not open input file: %s", err)
}
defer inputFile.Close()
outputFile, err := os.Create(dstPath)
if err != nil {
monitor.Log.Errorf("Could not open output file: %s", err)
}
defer outputFile.Close()
_, err = io.Copy(outputFile, inputFile)
if err != nil {
monitor.Log.Errorf("Writing to output file failed: %s", err)
}
err = os.Remove(srcPath)
if err != nil {
monitor.Log.Errorf("Failed removing original file: %s", err)
} }
} }