remove PID logic from main

This commit is contained in:
Mike Vanbuskirk
2023-10-10 16:58:52 -04:00
parent 80d9d9565a
commit 7126e35823
-51
View File
@@ -16,7 +16,6 @@ import (
"github.com/mattn/go-isatty"
"google.golang.org/protobuf/types/known/anypb"
"gopkg.in/alecthomas/kingpin.v2"
"github.com/mitchellh/go-ps"
"github.com/trufflesecurity/trufflehog/v3/pkg/common"
"github.com/trufflesecurity/trufflehog/v3/pkg/config"
@@ -213,50 +212,6 @@ func main() {
}
}
func getScannerPIDs() ([]int, error) {
ctx := context.Background()
logger := ctx.Logger()
logFatal := logFatalFunc(logger)
pids:= []int{}
procs, err := ps.Processes()
if err != nil {
logFatal(err, "Cannot get scanner PIDs")
}
for _, proc := range procs {
if strings.Contains(proc.Executable(), "trufflehog") {
pids = append(pids, proc.Pid())
}
}
return pids, nil
}
func cleanTempDir(pid int) {
ctx := context.Background()
logger := ctx.Logger()
logFatal := logFatalFunc(logger)
tempDir := os.TempDir()
files, err := os.ReadDir(tempDir)
if err != nil {
logFatal(err, "Failed to read the OS temporary directory")
}
pidStr := strconv.Itoa(pid)
for _, file := range files {
if file.IsDir() && strings.Contains(file.Name(), pidStr) && !strings.Contains(file.Name(), pidStr+"-") {
dirPath := fmt.Sprintf("%s/%s", tempDir, file.Name())
if err := os.RemoveAll(dirPath); err != nil {
logFatal(err, "Failed to remove directory")
}
fmt.Printf("Deleted directory: %s\n", dirPath)
}
}
}
func run(state overseer.State) {
ctx := context.Background()
logger := ctx.Logger()
@@ -576,12 +531,6 @@ func run(state overseer.State) {
}
}
pids, _ := getScannerPIDs()
for _, pid := range pids {
cleanTempDir(pid)
}
// Wait for all workers to finish.
if err = e.Finish(ctx); err != nil {
logFatal(err, "engine failed to finish execution")