Remove duplicated ReadFile function

src/ray/rpc/common.cc

@@ -0,0 +1,31 @@
+// Copyright 2017 The Ray Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http:https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <fstream>
+#include <sstream>
+
+#include "ray/rpc/common.h"
+
+namespace ray {
+namespace rpc {
+
+std::string ReadCert(std::string cert_filepath) {
+ std::ifstream t(cert_filepath);
+ std::stringstream buffer;
+ buffer << t.rdbuf();
+ return buffer.str();
+};
+
+} // namespace rpc
+} // namespace ray

src/ray/rpc/common.h

@@ -0,0 +1,22 @@
+// Copyright 2017 The Ray Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http:https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace ray {
+namespace rpc {
+
+// Utility to read cert file from a particular location
+std::string ReadCert(std::string cert_filepath);
+
+} // namespace rpc
+} // namespace ray

src/ray/rpc/grpc_client.h

@@ -17,13 +17,12 @@
 #include <grpcpp/grpcpp.h>
 
 #include <boost/asio.hpp>
-#include <fstream>
-#include <sstream>
 
 #include "ray/common/grpc_util.h"
 #include "ray/common/ray_config.h"
 #include "ray/common/status.h"
 #include "ray/rpc/client_call.h"
+#include "ray/rpc/common.h"
 
 namespace ray {
 namespace rpc {
@@ -108,13 +107,6 @@ class GrpcClient {
  /// Whether to use TLS.
  bool use_tls_;
 
- std::string ReadFile(std::string filename) { 
- std::ifstream t(filename);
- std::stringstream buffer;
- buffer << t.rdbuf();
- return buffer.str();
- };
-
  std::shared_ptr<grpc::Channel> BuildChannel(
  grpc::ChannelArguments argument,
  std::string address,
@@ -124,9 +116,9 @@ class GrpcClient {
  std::string server_cert_file = std::string(std::getenv("RAY_TLS_SERVER_CERT"));
  std::string server_key_file = std::string(std::getenv("RAY_TLS_SERVER_KEY"));
  std::string root_cert_file = std::string(std::getenv("RAY_TLS_CA_CERT"));
- std::string server_cert_chain = ReadFile(server_cert_file);
- std::string private_key = ReadFile(server_key_file);
- std::string cacert = ReadFile(root_cert_file);
+ std::string server_cert_chain = ReadCert(server_cert_file);
+ std::string private_key = ReadCert(server_key_file);
+ std::string cacert = ReadCert(root_cert_file);
 
  grpc::SslCredentialsOptions ssl_opts;
  ssl_opts.pem_root_certs=cacert;

src/ray/rpc/grpc_server.cc

@@ -17,11 +17,10 @@
 #include <grpcpp/impl/service_type.h>
 
 #include <boost/asio/detail/socket_holder.hpp>
-#include <fstream>
-#include <sstream>
 
 #include "ray/common/ray_config.h"
 #include "ray/rpc/grpc_server.h"
+#include "ray/rpc/common.h"
 #include "ray/stats/metric.h"
 #include "ray/util/util.h"
 
@@ -48,13 +47,6 @@ GrpcServer::GrpcServer(std::string name, const uint32_t port, int num_threads, b
  cqs_.resize(num_threads_);
 }
 
-std::string GrpcServer::ReadFile(std::string filename) {
- std::ifstream t(filename);
- std::stringstream buffer;
- buffer << t.rdbuf();
- return buffer.str();
-};
-
 void GrpcServer::Run() {
  uint32_t specified_port = port_;
  std::string server_address("0.0.0.0:" + std::to_string(port_));
@@ -80,9 +72,9 @@ void GrpcServer::Run() {
  std::string root_cert_file = std::string(std::getenv("RAY_TLS_CA_CERT"));
 
  // Create credentials from hardcoded location
- std::string rootcert = ReadFile(root_cert_file);
- std::string servercert = ReadFile(server_cert_file);
- std::string serverkey = ReadFile(server_key_file);
+ std::string rootcert = ReadCert(root_cert_file);
+ std::string servercert = ReadCert(server_cert_file);
+ std::string serverkey = ReadCert(server_key_file);
  grpc::SslServerCredentialsOptions::PemKeyCertPair pkcp = {serverkey.c_str(),
  servercert.c_str()};
 // grpc::SslServerCredentialsOptions ssl_opts;

src/ray/rpc/grpc_server.h

@@ -19,8 +19,6 @@
 #include <boost/asio.hpp>
 #include <thread>
 #include <utility>
-#include <fstream>
-#include <sstream>
 
 #include "ray/common/asio/instrumented_io_context.h"
 #include "ray/common/status.h"