github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-29 20:24:31 +00:00
Code Issues Projects Releases Wiki Activity

logging: Rework for shutdown

Browse Source 
Make changes to logger thread to allow the logger to be replaced with
a NOP logger (required for agent shutdown).

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
This commit is contained in:
James O. D. Hunt 2021-02-28 19:03:16 +00:00
parent 7d5f88c0ad
commit 011f7d785a
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/agent/src/main.rs
View File

@ -217,25 +217,39 @@ async fn real_main() -> std::result::Result<(), Box<dyn std::error::Error>> {
let writer = unsafe { File::from_raw_fd(wfd) }; let writer = unsafe { File::from_raw_fd(wfd) };
// Recreate a logger with the log level get from "/proc/cmdline". // Recreate a logger with the log level get from "/proc/cmdline".
let (logger, _logger_async_guard) = let (logger, logger_async_guard) =
logging::create_logger(NAME, "agent", config.log_level, writer); logging::create_logger(NAME, "agent", config.log_level, writer);
announce(&logger, &config); announce(&logger, &config);
// This "unused" variable is required as it enables the global (and crucially static) logger, // This variable is required as it enables the global (and crucially static) logger,
// which is required to satisfy the the lifetime constraints of the auto-generated gRPC code. // which is required to satisfy the the lifetime constraints of the auto-generated gRPC code.
let _guard = slog_scope::set_global_logger(logger.new(o!("subsystem" => "rpc"))); let global_logger = slog_scope::set_global_logger(logger.new(o!("subsystem" => "rpc")));
let mut _log_guard: Result<(), log::SetLoggerError> = Ok(()); // Allow the global logger to be modified later (for shutdown)
global_logger.cancel_reset();
let mut ttrpc_log_guard: Result<(), log::SetLoggerError> = Ok(());
if config.log_level == slog::Level::Trace { if config.log_level == slog::Level::Trace {
// Redirect ttrpc log calls to slog iff full debug requested // Redirect ttrpc log calls to slog iff full debug requested
_log_guard = Ok(slog_stdlog::init().map_err(|e| e)?); ttrpc_log_guard = Ok(slog_stdlog::init().map_err(|e| e)?);
} }
// Start the sandbox and wait for its ttRPC server to end // Start the sandbox and wait for its ttRPC server to end
start_sandbox(&logger, &config, init_mode).await?; start_sandbox(&logger, &config, init_mode).await?;
// Install a NOP logger for the remainder of the shutdown sequence
// to ensure any log calls made by local crates using the scope logger
// don't fail.
let global_logger_guard2 =
slog_scope::set_global_logger(slog::Logger::root(slog::Discard, o!()));
global_logger_guard2.cancel_reset();
drop(logger_async_guard);
drop(ttrpc_log_guard);
// Trigger a controlled shutdown // Trigger a controlled shutdown
shutdown_tx shutdown_tx
.send(true) .send(true)