34 lines
848 B
Diff
34 lines
848 B
Diff
From c9928ac212fd6e436d8e528bc5e9d9fda3fe51d8 Mon Sep 17 00:00:00 2001
|
|
From: zhongjiawei <zhongjiawei1@huawei.com>
|
|
Date: Fri, 30 Aug 2024 16:10:28 +0800
|
|
Subject: [PATCH] runc:format log instead panic when procError missing payload
|
|
|
|
---
|
|
libcontainer/sync.go | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/libcontainer/sync.go b/libcontainer/sync.go
|
|
index cf7b45b..9b5cd0d 100644
|
|
--- a/libcontainer/sync.go
|
|
+++ b/libcontainer/sync.go
|
|
@@ -2,6 +2,7 @@ package libcontainer
|
|
|
|
import (
|
|
"encoding/json"
|
|
+ "errors"
|
|
"fmt"
|
|
"io"
|
|
|
|
@@ -96,7 +97,7 @@ func parseSync(pipe io.Reader, fn func(*syncT) error) error {
|
|
return ierr
|
|
}
|
|
// Programmer error.
|
|
- panic("No error following JSON procError payload.")
|
|
+ return errors.New("procError missing error payload")
|
|
}
|
|
|
|
if err := fn(&sync); err != nil {
|
|
--
|
|
2.33.0
|
|
|