Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

admin: Add /reopen_logs admin handler #10286

Merged
merged 15 commits into from
Mar 18, 2020
Merged

admin: Add /reopen_logs admin handler #10286

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2c84f3c
Implement reopen_logs admin handler
veshij Mar 5, 2020
052e367
test added
veshij Mar 6, 2020
233a81a
Merge remote-tracking branch 'upstream/master' into reopen_logs
veshij Mar 6, 2020
d5aaf3a
ci/check_and_fix_format.sh
veshij Mar 6, 2020
87466b2
fix format
veshij Mar 6, 2020
2b365ca
fix format
veshij Mar 7, 2020
6b21754
tools/code_format/check_format.py fix
veshij Mar 7, 2020
d44976a
format
veshij Mar 7, 2020
1f07434
Merge remote-tracking branch 'upstream/master' into reopen_logs
veshij Mar 16, 2020
23485a9
revert format changes
veshij Mar 16, 2020
489fa20
update docs and release notes
veshij Mar 16, 2020
ddcbffb
get->post
veshij Mar 17, 2020
40315c8
get->post
veshij Mar 17, 2020
23c6da4
getCallback->postCallback
veshij Mar 17, 2020
da4e753
Kick CI
veshij Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/extensions/filters/network/common/redis/codec_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,8 @@ RespValue::CompositeArray::CompositeArrayConstIterator::operator++() {
return *this;
}

bool RespValue::CompositeArray::CompositeArrayConstIterator::operator!=(
const CompositeArrayConstIterator& rhs) const {
bool RespValue::CompositeArray::CompositeArrayConstIterator::
operator!=(const CompositeArrayConstIterator& rhs) const {
veshij marked this conversation as resolved.
Show resolved Hide resolved
return command_ != (rhs.command_) || &array_ != &(rhs.array_) || index_ != rhs.index_ ||
first_ != rhs.first_;
}
Expand Down
9 changes: 9 additions & 0 deletions source/server/http/admin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1344,6 +1344,13 @@ Http::Code AdminImpl::handlerRuntimeModify(absl::string_view url, Http::Response
return Http::Code::OK;
}

Http::Code AdminImpl::handlerReopenLogs(absl::string_view, Http::ResponseHeaderMap&,
Buffer::Instance& response, AdminStream&) {
server_.accessLogManager().reopen();
response.add("OK\n");
return Http::Code::OK;
}

ConfigTracker& AdminImpl::getConfigTracker() { return config_tracker_; }

void AdminFilter::onComplete() {
Expand Down Expand Up @@ -1449,6 +1456,8 @@ AdminImpl::AdminImpl(const std::string& profile_path, Server::Instance& server)
{"/runtime", "print runtime values", MAKE_ADMIN_HANDLER(handlerRuntime), false, false},
{"/runtime_modify", "modify runtime values", MAKE_ADMIN_HANDLER(handlerRuntimeModify),
false, true},
{"/reopen_logs", "reopen access logs", MAKE_ADMIN_HANDLER(handlerReopenLogs), false,
false},
veshij marked this conversation as resolved.
Show resolved Hide resolved
},
date_provider_(server.dispatcher().timeSource()),
admin_filter_chain_(std::make_shared<AdminFilterChain>()) {}
Expand Down
3 changes: 3 additions & 0 deletions source/server/http/admin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,9 @@ class AdminImpl : public Admin,
Http::Code handlerRuntimeModify(absl::string_view path_and_query,
Http::ResponseHeaderMap& response_headers,
Buffer::Instance& response, AdminStream&);
Http::Code handlerReopenLogs(absl::string_view path_and_query,
Http::ResponseHeaderMap& response_headers,
Buffer::Instance& response, AdminStream&);
bool isFormUrlEncoded(const Http::HeaderEntry* content_type) const;

class AdminListenSocketFactory : public Network::ListenSocketFactory {
Expand Down
10 changes: 10 additions & 0 deletions test/server/http/admin_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,6 +1249,16 @@ TEST_P(AdminInstanceTest, RuntimeModifyNoArguments) {
EXPECT_TRUE(absl::StartsWith(response.toString(), "usage:"));
}

TEST_P(AdminInstanceTest, ReopenLogs) {
Http::ResponseHeaderMapImpl header_map;
Buffer::OwnedImpl response;
testing::NiceMock<AccessLog::MockAccessLogManager> access_log_manager_;

EXPECT_CALL(server_, accessLogManager()).WillRepeatedly(ReturnRef(access_log_manager_));
EXPECT_CALL(access_log_manager_, reopen());
EXPECT_EQ(Http::Code::OK, getCallback("/reopen_logs", header_map, response));
veshij marked this conversation as resolved.
Show resolved Hide resolved
}

TEST_P(AdminInstanceTest, TracingStatsDisabled) {
const std::string& name = admin_.tracingStats().service_forced_.name();
for (const Stats::CounterSharedPtr& counter : server_.stats().counters()) {
Expand Down