修复coredump-tool数据读取不全的问题bugfix-15646

2 files changed, 16 insertions, 1 deletions

diff --git a/coredump-handler/coredump-handler.go b/coredump-handler/coredump-handler.go
index 554980d..c4c57a9 100644
--- a/coredump-handler/coredump-handler.go
+++ b/coredump-handler/coredump-handler.go
@@ -359,6 +359,21 @@ func main() {
 	//write coredump info
 	err = writeCoreConfig(coredump_config)
 	if err != nil {
+		journal.Print(journal.PriErr, err.Error())
+	}
+	flag, err = isDiskSufficient(pipe_config)
+	if err != nil {
+		journal.Print(journal.PriErr, "Can't judge disk's space is sufficient or not. "+err.Error())
+		return
+	}
+	if !flag {
+		journal.Print(journal.PriErr, "Disk space exceeds limit after write coredump!")
+		err := os.RemoveAll(pipe_config.Storage)
+		if err != nil {
+			journal.Print(journal.PriErr, err.Error())
+			return
+		}
 		journal.Print(journal.PriInfo, err.Error())
+		return
 	}
 }
diff --git a/coredump-tool/coredump-tool.go b/coredump-tool/coredump-tool.go
index e968f77..06b4cd5 100644
--- a/coredump-tool/coredump-tool.go
+++ b/coredump-tool/coredump-tool.go
@@ -70,7 +70,7 @@ func WalkDirectory(dir string) {
 			})
 
 			if err != nil {
-				return err
+				fmt.Printf("Error walking directory %s: %v\n", path, err)
 			}
 		}