41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
|
From c01b761e14e6b4ea6745688e47b255f17ba26055 Mon Sep 17 00:00:00 2001
|
||
|
|
From: zhongtao <zhongtao17@huawei.com>
|
||
|
|
Date: Wed, 6 Dec 2023 15:15:32 +0800
|
||
|
|
Subject: [PATCH 48/64] modify attach socket name
|
||
|
|
|
||
|
|
Signed-off-by: zhongtao <zhongtao17@huawei.com>
|
||
|
|
---
|
||
|
|
src/cmd/isulad-shim/common.h | 2 +-
|
||
|
|
src/daemon/modules/runtime/isula/isula_rt_ops.c | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/cmd/isulad-shim/common.h b/src/cmd/isulad-shim/common.h
|
||
|
|
index 2020a799..c4f86d24 100644
|
||
|
|
--- a/src/cmd/isulad-shim/common.h
|
||
|
|
+++ b/src/cmd/isulad-shim/common.h
|
||
|
|
@@ -60,7 +60,7 @@ extern "C" {
|
||
|
|
#define CONTAINER_ACTION_REBOOT 129
|
||
|
|
#define CONTAINER_ACTION_SHUTDOWN 130
|
||
|
|
|
||
|
|
-#define ATTACH_SOCKET "attach_socket.sock"
|
||
|
|
+#define ATTACH_SOCKET "attach.sock"
|
||
|
|
#define ATTACH_LOG_NAME "attach-log.json"
|
||
|
|
#define ATTACH_DETACH_MSG "read escape sequence"
|
||
|
|
#define MAX_ATTACH_NUM 16
|
||
|
|
diff --git a/src/daemon/modules/runtime/isula/isula_rt_ops.c b/src/daemon/modules/runtime/isula/isula_rt_ops.c
|
||
|
|
index 3950ff4a..fbb779f7 100644
|
||
|
|
--- a/src/daemon/modules/runtime/isula/isula_rt_ops.c
|
||
|
|
+++ b/src/daemon/modules/runtime/isula/isula_rt_ops.c
|
||
|
|
@@ -57,7 +57,7 @@
|
||
|
|
|
||
|
|
#define SHIM_BINARY "isulad-shim"
|
||
|
|
#define RESIZE_FIFO_NAME "resize_fifo"
|
||
|
|
-#define ATTACH_SOCKET "attach_socket.sock"
|
||
|
|
+#define ATTACH_SOCKET "attach.sock"
|
||
|
|
#define SHIM_LOG_SIZE ((BUFSIZ - 100) / 2)
|
||
|
|
#define RESIZE_DATA_SIZE 100
|
||
|
|
#define PID_WAIT_TIME 120
|
||
|
|
--
|
||
|
|
2.42.0
|
||
|
|
|