From 6dd49a5c8f64369ebc269fdc41a97c4a27f160f5 Mon Sep 17 00:00:00 2001
From: David Garcia Quintas <dgq@google.com>
Date: Wed, 15 Jul 2015 14:58:32 -0700
Subject: [PATCH] Added some methods to context inspector. Also minor tweak to
server context IsCancelled() method
---
include/grpc++/server_context.h | 2 +-
src/cpp/server/server_context.cc | 2 +-
test/cpp/interop/server_helper.cc | 9 +++++++++
test/cpp/interop/server_helper.h | 4 +++-
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/include/grpc++/server_context.h b/include/grpc++/server_context.h
index e6440c7fd8..830b6b0b6f 100644
--- a/include/grpc++/server_context.h
+++ b/include/grpc++/server_context.h
@@ -97,7 +97,7 @@ class ServerContext {
void AddInitialMetadata(const grpc::string& key, const grpc::string& value);
void AddTrailingMetadata(const grpc::string& key, const grpc::string& value);
- bool IsCancelled();
+ bool IsCancelled() const;
const std::multimap<grpc::string, grpc::string>& client_metadata() {
return client_metadata_;
diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc
index 1bb3a8bcc4..908c065ae6 100644
--- a/src/cpp/server/server_context.cc
+++ b/src/cpp/server/server_context.cc
@@ -144,7 +144,7 @@ void ServerContext::AddTrailingMetadata(const grpc::string& key,
trailing_metadata_.insert(std::make_pair(key, value));
}
-bool ServerContext::IsCancelled() {
+bool ServerContext::IsCancelled() const {
return completion_op_ && completion_op_->CheckCancelled(cq_);
}
diff --git a/test/cpp/interop/server_helper.cc b/test/cpp/interop/server_helper.cc
index 0f8b89ced2..30a78ffddf 100644
--- a/test/cpp/interop/server_helper.cc
+++ b/test/cpp/interop/server_helper.cc
@@ -62,5 +62,14 @@ InteropContextInspector::InteropContextInspector(
const ::grpc::ServerContext& context)
: context_(context) {}
+std::shared_ptr<const AuthContext> InteropContextInspector::GetAuthContext()
+ const {
+ return context_.auth_context();
+}
+
+bool InteropContextInspector::IsCancelled() const {
+ return context_.IsCancelled();
+}
+
} // namespace testing
} // namespace grpc
diff --git a/test/cpp/interop/server_helper.h b/test/cpp/interop/server_helper.h
index d738d05038..ce977b4705 100644
--- a/test/cpp/interop/server_helper.h
+++ b/test/cpp/interop/server_helper.h
@@ -48,7 +48,9 @@ class InteropContextInspector {
public:
InteropContextInspector(const ::grpc::ServerContext& context);
- // Inspector methods, able to peek inside ServerContext go here.
+ // Inspector methods, able to peek inside ServerContext, follow.
+ std::shared_ptr<const AuthContext> GetAuthContext() const;
+ bool IsCancelled() const;
private:
const ::grpc::ServerContext& context_;
--
GitLab