From cf47c8b4a5d22f317cb88ee1c11b5c695c508d1f Mon Sep 17 00:00:00 2001 From: Fabricio Voznika Date: Thu, 12 Nov 2020 19:09:43 -0800 Subject: Improve shim debug logging - Add log statements in service entry points. - Propagate `-debug` flag from shim invokation to the service - Load options when shim process is invoked to ensure runsc commands use the correct set of options, e.g. --debug --debug-logs=... - Add debug options to the shim configuration directly, so it doesn't rely on containerd configuration (and restart) to enable shim debug. - Save shim logs to dedicated file, so it's easier to read logs. They would be mixed with containerd logs and hard to distinguish otherwise. PiperOrigin-RevId: 342179868 --- pkg/shim/v2/BUILD | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkg/shim/v2/BUILD') diff --git a/pkg/shim/v2/BUILD b/pkg/shim/v2/BUILD index 7e0a114a0..f37fefddc 100644 --- a/pkg/shim/v2/BUILD +++ b/pkg/shim/v2/BUILD @@ -7,15 +7,17 @@ go_library( srcs = [ "api.go", "epoll.go", + "options.go", "service.go", "service_linux.go", + "state.go", ], visibility = ["//shim:__subpackages__"], deps = [ + "//pkg/cleanup", "//pkg/shim/runsc", "//pkg/shim/v1/proc", "//pkg/shim/v1/utils", - "//pkg/shim/v2/options", "//pkg/shim/v2/runtimeoptions", "//runsc/specutils", "@com_github_burntsushi_toml//:go_default_library", @@ -38,6 +40,7 @@ go_library( "@com_github_containerd_fifo//:go_default_library", "@com_github_containerd_typeurl//:go_default_library", "@com_github_gogo_protobuf//types:go_default_library", + "@com_github_sirupsen_logrus//:go_default_library", "@org_golang_x_sys//unix:go_default_library", ], ) -- cgit v1.2.3