Address merge conflicts

ORNL · Apr 10, 2024 · 5003935 · 5003935
2 parents bb493be + 8ec199e
commit 5003935
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 15 deletions.
diff --git a/cmake/curl_version.cpp b/cmake/curl_version.cpp
@@ -2,8 +2,8 @@
 #include <iostream>
 
 /**
- * This script is used to show what vesion of curl is being used with the 
- * rest of the build process and will print the version number of the curl 
+ * This script is used to show what vesion of curl is being used with the
+ * rest of the build process and will print the version number of the curl
  * library.
  **/
 int main() {

diff --git a/common/include/common/CommunicatorFactory.hpp b/common/include/common/CommunicatorFactory.hpp
@@ -18,7 +18,8 @@ class CommunicatorFactory {
   LogContext m_log_context;
 
 public:
-  explicit CommunicatorFactory(const LogContext & log_context) : m_log_context(log_context){};
+  explicit CommunicatorFactory(const LogContext & log_context)
+      : m_log_context(log_context){};
 
   std::unique_ptr<ICommunicator> create(const SocketOptions &socket_options,
                                         const ICredentials &credentials,

diff --git a/common/include/common/DynaLog.hpp b/common/include/common/DynaLog.hpp
@@ -75,14 +75,14 @@ namespace SDMS {
 
 /**
  * Here unsigned int is used so that we can compare the numeric values when
- * choosing whether to print a log message. 
+ * choosing whether to print a log message.
  *
  * CRITICAL = 0
  * ERROR    = 1
  * WARNING  = 2
  * INFO     = 3
  * DEBUG    = 4
- * TRACE    = 5 
+ * TRACE    = 5
  **/
 enum class LogLevel : unsigned int {
   CRITICAL,

diff --git a/common/include/common/ServerFactory.hpp b/common/include/common/ServerFactory.hpp
@@ -30,7 +30,8 @@ class ServerFactory {
   LogContext m_log_context;
 
 public:
-  explicit ServerFactory(const LogContext & log_context) : m_log_context(log_context){};
+  explicit ServerFactory(const LogContext & log_context)
+      : m_log_context(log_context){};
 
   std::unique_ptr<IServer> create(
       ServerType server_type,

diff --git a/common/source/servers/ProxyBasicZMQ.cpp b/common/source/servers/ProxyBasicZMQ.cpp
@@ -19,8 +19,8 @@
 
 namespace SDMS {
 
-std::string sanitize(std::string val, const std::string & pattern,
-                     const std::string & replacement) {
+std::string sanitize(std::string val, const std::string &pattern,
+                     const std::string &replacement) {
   for (auto at = val.find(pattern, 0); at != std::string::npos;
        at = val.find(pattern, at + replacement.length())) {
 
@@ -186,7 +186,7 @@ void ProxyBasicZMQ::run() {
    * loop.
    **/
   auto terminate_call = [](std::chrono::duration<double> duration,
-                           const std::string & address, int thread_id,
+                           const std::string &address, int thread_id,
                            LogContext log_context) {
     log_context.thread_name += "-terminate_after_timeout";
     log_context.thread_id = thread_id;

diff --git a/core/server/AuthenticationManager.cpp b/core/server/AuthenticationManager.cpp
@@ -104,9 +104,9 @@ std::string AuthenticationManager::getUID(const std::string &public_key) const {
   EXCEPT(1, "Unrecognized public_key during execution of getUID.");
 }
 
-void AuthenticationManager::addKey(const PublicKeyType & pub_key_type,
-                                   const std::string & public_key,
-                                   const std::string & uid) {
+void AuthenticationManager::addKey(const PublicKeyType &pub_key_type,
+                                   const std::string &public_key,
+                                   const std::string &uid) {
   std::lock_guard<std::mutex> lock(m_lock);
   m_auth_mapper.addKey(pub_key_type, public_key, uid);
 }

diff --git a/core/server/AuthenticationManager.hpp b/core/server/AuthenticationManager.hpp
@@ -79,8 +79,8 @@ class AuthenticationManager : public IAuthenticationManager {
    **/
   virtual bool hasKey(const std::string &pub_key) const final;
 
-  void addKey(const PublicKeyType & pub_key_type, const std::string & public_key,
-              const std::string & uid);
+  void addKey(const PublicKeyType &pub_key_type, const std::string &public_key,
+              const std::string &uid);
 
   /**
    * Will the id or throw an error

diff --git a/repository/server/RepoServer.cpp b/repository/server/RepoServer.cpp
@@ -155,7 +155,7 @@ void Server::checkServerVersion() {
    * The reasoning was that doing so would make the repo service dependent
    * on the core actually running. By continually looping the coupling between
    * the core services and the repo service is reduced.
-   **/ 
+   **/
   while (true) {
     ++attempt;
     DL_INFO(m_log_context,