[core] Use spdlog fd sink within pipe logger #50173
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: dentiny <[email protected]>
dentiny
force-pushed
the
hjiang/spdlog-fd-sink-pipe
branch
from
d6699e1 to
942fd8f
Compare
Signed-off-by: dentiny <[email protected]>
dentiny
force-pushed
the
hjiang/spdlog-fd-sink-pipe
branch
from
942fd8f to
46bf843
Compare
jjyao
reviewed
Feb 1, 2025
Comment on lines
+197
to
+202
| auto logger_sink = std::make_shared<non_owned_fd_sink_st>(handle); | ||
| auto logger = std::make_shared<spdlog::logger>( | ||
| /*name=*/absl::StrFormat("pipe-logger-%s", file_path), std::move(logger_sink)); | ||
| logger->set_level(spdlog::level::info); | ||
| logger->set_pattern("%v"); // Only message string is logged. | ||
|
|
There was a problem hiding this comment.
This is the case for no tee no rotation? In this case, we don't write to the logger?
There was a problem hiding this comment.
Yes you're right, logger is not necessity here, but otherwise we will have two implementation for StreamRedirectionHandle,
- one using file descriptor, and take
flush_fn - another using logger, no need for
flush_fn, which beats the purpose for this PR to simplify code structure
| @@ -224,7 +224,7 @@ TEST(PipeLoggerCompatTest, CompatibilityTest) { | |||
| stream_redirection_handle.Close(); | |||
|
|
|||
| const std::string stdout_content = testing::internal::GetCapturedStdout(); | |||
| EXPECT_EQ(stdout_content, kContent); | |||
| EXPECT_EQ(stdout_content, "hello\nworld\n"); | |||
There was a problem hiding this comment.
why changing this? it should just match kContent right
There was a problem hiding this comment.
No, in the pr we use spdlog for all sinks, which means newliner at the end for everything.
There was a problem hiding this comment.
Yes, but for this test, kContent already has the newliner at the end.
There was a problem hiding this comment.
OK, thats for code style consistency, we're using raw string to match elsewhere
Signed-off-by: dentiny <[email protected]>
Signed-off-by: dentiny <[email protected]>
dentiny
force-pushed
the
hjiang/spdlog-fd-sink-pipe
branch
from
fb006b7 to
3f4dc0b
Compare
Signed-off-by: dentiny <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is the followup for #50144, which integrates FD sink to the pipe logger.
The benefit is we have less file descriptor related code within pipe logger, and all write, flush and close feature handled in spdlog logger.
One behavior change, we use default formatter for all possible sinks, which appends newliner to each message.