From 7115aa3b7f22f95e5e614ffc74c467844c08d965 Mon Sep 17 00:00:00 2001
From: Florent Le Coz <louiz@louiz.org>
Date: Tue, 24 Feb 2015 16:28:30 +0100
Subject: Add a reload add-hoc command

---
 src/utils/reload.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 src/utils/reload.cpp

(limited to 'src/utils/reload.cpp')

diff --git a/src/utils/reload.cpp b/src/utils/reload.cpp
new file mode 100644
index 0000000..6600c75
--- /dev/null
+++ b/src/utils/reload.cpp
@@ -0,0 +1,13 @@
+#include <config/config.hpp>
+#include <logger/logger.hpp>
+
+void reload_process()
+{
+  // Closing the config will just force it to be reopened the next time
+  // a configuration option is needed
+  Config::close();
+  // Destroy the logger instance, to be recreated the next time a log
+  // line needs to be written
+  Logger::instance().reset();
+  log_debug("Configuration and logger reloaded.");
+}
-- 
cgit v1.2.3


From d600a2843f1dbe3b1ba2dead9a020cc73d7d10ae Mon Sep 17 00:00:00 2001
From: Florent Le Coz <louiz@louiz.org>
Date: Fri, 27 Feb 2015 12:16:09 +0100
Subject: Remove all the libs that are now in louloulibs

---
 src/utils/reload.cpp | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 src/utils/reload.cpp

(limited to 'src/utils/reload.cpp')

diff --git a/src/utils/reload.cpp b/src/utils/reload.cpp
deleted file mode 100644
index 6600c75..0000000
--- a/src/utils/reload.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <config/config.hpp>
-#include <logger/logger.hpp>
-
-void reload_process()
-{
-  // Closing the config will just force it to be reopened the next time
-  // a configuration option is needed
-  Config::close();
-  // Destroy the logger instance, to be recreated the next time a log
-  // line needs to be written
-  Logger::instance().reset();
-  log_debug("Configuration and logger reloaded.");
-}
-- 
cgit v1.2.3


From 9fb2e116c47a9d4e2866d34450d12dcb90d4a26c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Tue, 12 Jul 2016 01:15:34 +0200
Subject: Move reload.*pp from louloulibs to src

---
 src/utils/reload.cpp | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 src/utils/reload.cpp

(limited to 'src/utils/reload.cpp')

diff --git a/src/utils/reload.cpp b/src/utils/reload.cpp
new file mode 100644
index 0000000..7125a75
--- /dev/null
+++ b/src/utils/reload.cpp
@@ -0,0 +1,28 @@
+#include <utils/reload.hpp>
+#include <database/database.hpp>
+#include <config/config.hpp>
+#include <utils/xdg.hpp>
+#include <logger/logger.hpp>
+
+void open_database()
+{
+  const auto db_filename = Config::get("db_name", xdg_data_path("biboumi.sqlite"));
+  log_info("Opening database: ", db_filename);
+  Database::open(db_filename);
+  log_info("database successfully opened.");
+}
+
+void reload_process()
+{
+  Config::read_conf();
+  // Destroy the logger instance, to be recreated the next time a log
+  // line needs to be written
+  Logger::instance().reset();
+  log_info("Configuration and logger reloaded.");
+  try {
+      open_database();
+    } catch (const litesql::DatabaseError&) {
+      log_warning("Re-using the previous database.");
+    }
+}
+
-- 
cgit v1.2.3


From 24824a5015e77aced8adf8afc35b82984e8b84fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Mon, 18 Jul 2016 09:53:15 +0200
Subject: In reload.cpp, only build the database things if litesql is used

---
 src/utils/reload.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/utils/reload.cpp')

diff --git a/src/utils/reload.cpp b/src/utils/reload.cpp
index 7125a75..348c5b5 100644
--- a/src/utils/reload.cpp
+++ b/src/utils/reload.cpp
@@ -4,12 +4,16 @@
 #include <utils/xdg.hpp>
 #include <logger/logger.hpp>
 
+#include "biboumi.h"
+
 void open_database()
 {
+#ifdef USE_DATABASE
   const auto db_filename = Config::get("db_name", xdg_data_path("biboumi.sqlite"));
   log_info("Opening database: ", db_filename);
   Database::open(db_filename);
   log_info("database successfully opened.");
+#endif
 }
 
 void reload_process()
@@ -19,10 +23,12 @@ void reload_process()
   // line needs to be written
   Logger::instance().reset();
   log_info("Configuration and logger reloaded.");
+#ifdef USE_DATABASE
   try {
       open_database();
     } catch (const litesql::DatabaseError&) {
       log_warning("Re-using the previous database.");
     }
+#endif
 }
 
-- 
cgit v1.2.3