rename queue to message_queue, add exception handling to settings

CMakeLists.txt

@@ -19,12 +19,14 @@
 cmake_minimum_required(VERSION 3.16)
 project(dtranslatebot VERSION 0.1 DESCRIPTION "Discord Translation Bot")
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 add_executable(${PROJECT_NAME}
     src/main.cpp
-    src/queue.cpp
+    src/message_queue.cpp
+    src/message_queue.h
     src/settings.cpp
+    src/settings.h
 )
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)

src/main.cpp

@@ -19,7 +19,7 @@
 #include <dpp/dpp.h>
 #include <iostream>
 #include <thread>
-#include "queue.h"
+#include "message_queue.h"
 #include "settings.h"
 
 int main(int argc, char* argv[]) {
@@ -36,10 +36,10 @@ int main(int argc, char* argv[]) {
 
     bot.on_log(dpp::utility::cout_logger());
 
-    bot::queue queue;
-    std::thread queue_loop(&bot::queue::run, &queue, &bot, &settings);
+    bot::message_queue message_queue;
+    std::thread message_queue_loop(&bot::message_queue::run, &message_queue, &bot, &settings);
 
-    bot.on_message_create([&bot, &queue, &settings](const dpp::message_create_t &event) {
+    bot.on_message_create([&bot, &message_queue, &settings](const dpp::message_create_t &event) {
         if (event.msg.author.is_bot())
             return;
 
@@ -55,7 +55,7 @@ int main(int argc, char* argv[]) {
                 message.webhook = channel->webhook;
                 message.source = channel->source;
                 message.target = channel->target;
-                queue.add(message);
+                message_queue.add(message);
             }
         }
         settings.unlock();

src/message_queue.cpp

@@ -18,18 +18,18 @@
 
 #include <iostream>
 #include <thread>
-#include "queue.h"
+#include "message_queue.h"
 #include "settings.h"
 using namespace std::chrono_literals;
 
-void bot::queue::add(const bot::message &message)
+void bot::message_queue::add(const bot::message &message)
 {
     m_mutex.lock();
     m_queue.push_back(message);
     m_mutex.unlock();
 }
 
-void bot::queue::run(dpp::cluster *bot, bot::settings::settings *settings)
+void bot::message_queue::run(dpp::cluster *bot, bot::settings::settings *settings)
 {
     while (true) {
         m_mutex.lock();

src/message_queue.h

@@ -16,8 +16,8 @@
 * responsible for anything with use of the software, you are self responsible.
 *****************************************************************************/
 
-#ifndef QUEUE_H
-#define QUEUE_H
+#ifndef MESSAGE_QUEUE_H
+#define MESSAGE_QUEUE_H
 #include <dpp/dpp.h>
 #include <mutex>
 #include <string>
@@ -36,7 +36,7 @@ namespace bot {
         std::string target;
     };
 
-    class queue {
+    class message_queue {
     public:
         void add(const bot::message &message);
         void run(dpp::cluster *bot, bot::settings::settings *settings);
@@ -47,4 +47,4 @@ namespace bot {
     };
 }
 
-#endif //QUEUE_H
+#endif //MESSAGE_QUEUE_H

src/settings.cpp

@@ -17,6 +17,7 @@
 *****************************************************************************/
 
 #include <dpp/dpp.h>
+#include <mutex>
 #include <iostream>
 #include "settings.h"
 
@@ -76,20 +77,19 @@ bool bot::settings::settings::parse(const std::string &filename)
         return false;
     }
 
-    m_mutex.lock();
+    const std::lock_guard<std::recursive_mutex> guard(m_mutex);
+    try {
         m_token = json_token.value();
 
         auto json_translate = json.find("translate");
         if (json_translate == json.end()) {
             std::cerr << "Translate settings can not be found" << std::endl;
-        m_mutex.unlock();
             return false;
         }
 
         auto json_translate_hostname = json_translate.value().find("hostname");
         if (json_translate_hostname == json_translate.value().end()) {
             std::cerr << "\"hostname\" can not be found in Translate settings" << std::endl;
-        m_mutex.unlock();
             return false;
         }
         m_translate_settings.hostname = json_translate_hostname.value();
@@ -97,7 +97,6 @@ bool bot::settings::settings::parse(const std::string &filename)
         auto json_translate_port = json_translate.value().find("port");
         if (json_translate_port == json_translate.value().end()) {
             std::cerr << "\"port\" can not be found in Translate settings" << std::endl;
-        m_mutex.unlock();
             return false;
         }
         m_translate_settings.port = json_translate_port.value();
@@ -105,7 +104,6 @@ bool bot::settings::settings::parse(const std::string &filename)
         auto json_translate_url = json_translate.value().find("url");
         if (json_translate_url == json_translate.value().end()) {
             std::cerr << "\"url\" can not be found in Translate settings" << std::endl;
-        m_mutex.unlock();
             return false;
         }
         m_translate_settings.url = json_translate_url.value();
@@ -151,10 +149,16 @@ bool bot::settings::settings::parse(const std::string &filename)
                 }
             }
         }
-
-    m_mutex.unlock();
         return true;
     }
+    catch (const std::exception &exception) {
+        std::cerr << "Exception thrown while parsing configuration: " << exception.what() << std::endl;
+    }
+    catch (...) {
+        std::cerr << "Exception thrown while parsing configuration: unknown" << std::endl;
+    }
+    return false;
+}
 
 void bot::settings::settings::unlock()
 {

src/settings.h

@@ -20,6 +20,7 @@
 #define SETTINGS_H
 #include <cstdint>
 #include <mutex>
+#include <string>
 #include <vector>
 
 namespace bot {