intercept: cosmetic changes

Author: rizsotto

source/intercept/source/collect/Reporter.cc

@@ -22,7 +22,6 @@
 
 #include <spdlog/spdlog.h>
 
-#include <memory>
 #include <utility>
 
 namespace ic {
@@ -38,12 +37,14 @@ namespace ic {
                 });
     }
 
-    Reporter::Reporter(ic::EventsDatabase::Ptr events)
-            : events_(std::move(events))
+    Reporter::Reporter(ic::EventsDatabase::Ptr database)
+            : database_(std::move(database))
+            , mutex_()
     { }
 
     void Reporter::report(const rpc::Event& event) {
-        events_->insert_event(event)
+        std::lock_guard<std::mutex> guard(mutex_);
+        database_->insert_event(event)
                 .on_error([](auto error) {
                     spdlog::warn("Writing event into database failed: {} Ignored.", error.what());
                 });

source/intercept/source/collect/Reporter.h

@@ -19,30 +19,26 @@
 
 #pragma once
 
-#include "collect/Session.h"
-#include "EventsDatabase.h"
+#include "collect/EventsDatabase.h"
 #include "libflags/Flags.h"
 #include "libresult/Result.h"
 #include "intercept.pb.h"
 
-#include <filesystem>
 #include <memory>
-#include <cstdint>
-
-namespace fs = std::filesystem;
+#include <mutex>
 
 namespace ic {
 
     // Responsible to collect executions and persist them into an output file.
     class Reporter {
     public:
         using Ptr = std::shared_ptr<Reporter>;
-        static rust::Result<Reporter::Ptr> from(const flags::Arguments&);
+        static rust::Result<Reporter::Ptr> from(const flags::Arguments &flags);
 
-        void report(const rpc::Event& request);
+        void report(const rpc::Event &request);
 
     public:
-        explicit Reporter(ic::EventsDatabase::Ptr events);
+        explicit Reporter(ic::EventsDatabase::Ptr database);
 
         Reporter() = delete;
         ~Reporter() noexcept = default;
@@ -54,6 +50,7 @@ namespace ic {
         Reporter& operator=(Reporter&&) noexcept = delete;
 
     private:
-        ic::EventsDatabase::Ptr events_;
+        ic::EventsDatabase::Ptr database_;
+        std::mutex mutex_;
     };
 }

source/intercept/source/collect/RpcServices.cc

@@ -42,15 +42,11 @@ namespace ic {
     InterceptorImpl::InterceptorImpl(Reporter &reporter)
             : rpc::Interceptor::Service()
             , reporter_(reporter)
-            , lock_()
     { }
 
     grpc::Status InterceptorImpl::Register(grpc::ServerContext*, const rpc::Event* request, rpc::Empty*)
     {
-        std::lock_guard<std::mutex> guard(lock_);
-
         reporter_.report(*request);
-
         return ::grpc::Status::OK;
     }
 }

source/intercept/source/collect/RpcServices.h

@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <mutex>
-
 #include "intercept.grpc.pb.h"
 #include "supervise.grpc.pb.h"
 
@@ -49,6 +47,5 @@ namespace ic {
 
     private:
         Reporter& reporter_;
-        std::mutex lock_;
     };
 }