Rename Refresh to Recreate

Author: Molter73

collector/lib/CollectorOutput.cpp

@@ -122,11 +122,11 @@ bool CollectorOutput::EstablishGrpcStreamSingle() {
   // Refresh all clients
   bool success = true;
   for (const auto& client : signal_clients_) {
-    success &= client->Refresh();
+    success &= client->Recreate();
   }
 
   for (const auto& client : sensor_clients_) {
-    success &= client->Refresh();
+    success &= client->Recreate();
   }
 
   if (success) {

collector/lib/CollectorOutput.h

@@ -10,6 +10,7 @@
 #include "SensorClient.h"
 #include "SignalHandler.h"
 #include "SignalServiceClient.h"
+#include "StoppableThread.h"
 
 namespace collector {
 

collector/lib/SensorClient.cpp

@@ -3,7 +3,7 @@
 #include "Logging.h"
 
 namespace collector {
-bool SensorClient::Refresh() {
+bool SensorClient::Recreate() {
   context_ = std::make_unique<grpc::ClientContext>();
   writer_ = DuplexClient::CreateWithReadsIgnored(&sensor::CollectorService::Stub::AsyncCommunicate, channel_, context_.get());
   if (!writer_->WaitUntilStarted(std::chrono::seconds(30))) {

collector/lib/SensorClient.h

@@ -1,7 +1,6 @@
 #ifndef _SENSOR_CLIENT_H_
 #define _SENSOR_CLIENT_H_
 
-#include <condition_variable>
 #include <memory>
 
 #include <grpcpp/channel.h>
@@ -11,7 +10,6 @@
 
 #include "DuplexGRPC.h"
 #include "SignalHandler.h"
-#include "StoppableThread.h"
 
 namespace collector {
 
@@ -33,7 +31,7 @@ class ISensorClient {
    *
    * @returns true if the refresh was succesful, false otherwise.
    */
-  virtual bool Refresh() = 0;
+  virtual bool Recreate() = 0;
 
   /**
    * Send a message to sensor through the iservice.
@@ -61,7 +59,7 @@ class SensorClient : public ISensorClient {
       : channel_(std::move(channel)) {
   }
 
-  bool Refresh() override;
+  bool Recreate() override;
 
   SignalHandler::Result SendMsg(const sensor::MsgFromCollector& msg) override;
 
@@ -78,7 +76,7 @@ class SensorClient : public ISensorClient {
 };
 
 class SensorClientStdout : public ISensorClient {
-  bool Refresh() override { return true; }
+  bool Recreate() override { return true; }
 
   SignalHandler::Result SendMsg(const sensor::MsgFromCollector& msg) override {
     LogProtobufMessage(msg);

collector/lib/SignalServiceClient.cpp

@@ -5,7 +5,7 @@
 
 namespace collector {
 
-bool SignalServiceClient::Refresh() {
+bool SignalServiceClient::Recreate() {
   context_ = std::make_unique<grpc::ClientContext>();
   writer_ = DuplexClient::CreateWithReadsIgnored(&SignalService::Stub::AsyncPushSignals, channel_, context_.get());
   if (!writer_->WaitUntilStarted(std::chrono::seconds(30))) {

collector/lib/SignalServiceClient.h

@@ -3,26 +3,22 @@
 // SIGNAL_SERVICE_CLIENT.h
 // This class defines our GRPC client abstraction
 
-#include <mutex>
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 
-#include "api/v1/signal.pb.h"
 #include "internalapi/sensor/signal_iservice.grpc.pb.h"
 
 #include "DuplexGRPC.h"
 #include "SignalHandler.h"
-#include "StoppableThread.h"
 
 namespace collector {
 
 class ISignalServiceClient {
  public:
   using SignalStreamMessage = sensor::SignalStreamMessage;
 
-  virtual bool Refresh() = 0;
+  virtual bool Recreate() = 0;
   virtual SignalHandler::Result PushSignals(const SignalStreamMessage& msg) = 0;
 
   virtual ~ISignalServiceClient() = default;
@@ -44,7 +40,7 @@ class SignalServiceClient : public ISignalServiceClient {
   explicit SignalServiceClient(std::shared_ptr<grpc::Channel> channel)
       : channel_(std::move(channel)), stream_active_(false) {}
 
-  bool Refresh() override;
+  bool Recreate() override;
 
   SignalHandler::Result PushSignals(const SignalStreamMessage& msg) override;
 
@@ -69,7 +65,7 @@ class StdoutSignalServiceClient : public ISignalServiceClient {
 
   explicit StdoutSignalServiceClient() = default;
 
-  bool Refresh() override { return true; }
+  bool Recreate() override { return true; }
 
   SignalHandler::Result PushSignals(const SignalStreamMessage& msg) override;
 };

collector/test/CollectorOutputTest.cpp

@@ -10,13 +10,13 @@
 namespace collector {
 class MockSensorClient : public ISensorClient {
  public:
-  MOCK_METHOD(bool, Refresh, ());
+  MOCK_METHOD(bool, Recreate, ());
   MOCK_METHOD(SignalHandler::Result, SendMsg, (const sensor::MsgFromCollector&));
 };
 
 class MockSignalClient : public ISignalServiceClient {
  public:
-  MOCK_METHOD(bool, Refresh, ());
+  MOCK_METHOD(bool, Recreate, ());
   MOCK_METHOD(SignalHandler::Result, PushSignals, (const sensor::SignalStreamMessage&));
 };