[Rework] Refactor libraries structure

* Move logger implementation to libserver
* Move fuzzy backend files to a separate subdir

TODO: Move HTTP code from libutil

diff --git a/src/fuzzy_storage.c b/src/fuzzy_storage.c
index a57f077970959fd8d419013ead078749c549e49e..5bc8cf29de102630efebc383adb93b14004f8eab 100644 (file)
--- a/src/fuzzy_storage.c
+++ b/src/fuzzy_storage.c
@@ -24,7 +24,7 @@
 #include "map.h"
 #include "map_helpers.h"
 #include "fuzzy_wire.h"
-#include "fuzzy_backend.h"
+#include "libserver/fuzzy_backend/fuzzy_backend.h"
 #include "ottery.h"
 #include "ref.h"
 #include "xxhash.h"

diff --git a/src/libmime/lang_detection.c b/src/libmime/lang_detection.c
index a178b1bf802e5d6a960415b8f7e337e2f9b6326d..9936bedfa0d42cf32f40f4c125265b1ef34e1cb6 100644 (file)
--- a/src/libmime/lang_detection.c
+++ b/src/libmime/lang_detection.c
@@ -15,7 +15,7 @@
  */
 
 #include "lang_detection.h"
-#include "libutil/logger.h"
+#include "libserver/logger.h"
 #include "libcryptobox/cryptobox.h"
 #include "libutil/multipattern.h"
 #include "ucl.h"

diff --git a/src/libserver/CMakeLists.txt b/src/libserver/CMakeLists.txt
index f0dcae867800324210a2e81c71d228060ca0d5fb..4b999c90066227603c15ffc07661529ecd6e5e07 100644 (file)
--- a/src/libserver/CMakeLists.txt
+++ b/src/libserver/CMakeLists.txt
@@ -7,22 +7,25 @@ SET(LIBRSPAMDSERVERSRC
                                ${CMAKE_CURRENT_SOURCE_DIR}/dns.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/dynamic_cfg.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/async_session.c
-                               ${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend.c
-                               ${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend_sqlite.c
+                               ${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend/fuzzy_backend.c
+                               ${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend/fuzzy_backend_sqlite.c
+                               ${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend/fuzzy_backend_redis.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/html.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/milter.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/monitored.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/protocol.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/re_cache.c
+                               ${CMAKE_CURRENT_SOURCE_DIR}/redis_pool.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/roll_history.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/spf.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/rspamd_symcache.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/task.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/url.c
-                               ${CMAKE_CURRENT_SOURCE_DIR}/worker_util.c)
-
-LIST(APPEND LIBRSPAMDSERVERSRC "${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend_redis.c")
-LIST(APPEND LIBRSPAMDSERVERSRC "${CMAKE_CURRENT_SOURCE_DIR}/redis_pool.c")
+                               ${CMAKE_CURRENT_SOURCE_DIR}/worker_util.c
+                               ${CMAKE_CURRENT_SOURCE_DIR}/logger/logger.c
+                               ${CMAKE_CURRENT_SOURCE_DIR}/logger/logger_file.c
+                               ${CMAKE_CURRENT_SOURCE_DIR}/logger/logger_syslog.c
+                               ${CMAKE_CURRENT_SOURCE_DIR}/logger/logger_console.c)
 
 # Librspamd-server
 SET(RSPAMD_SERVER ${LIBRSPAMDSERVERSRC} PARENT_SCOPE)

diff --git a/src/libserver/fuzzy_backend.c b/src/libserver/fuzzy_backend/fuzzy_backend.c
similarity index 100%
rename from src/libserver/fuzzy_backend.c
rename to src/libserver/fuzzy_backend/fuzzy_backend.c

diff --git a/src/libserver/fuzzy_backend.h b/src/libserver/fuzzy_backend/fuzzy_backend.h
similarity index 100%
rename from src/libserver/fuzzy_backend.h
rename to src/libserver/fuzzy_backend/fuzzy_backend.h

diff --git a/src/libserver/fuzzy_backend_redis.c b/src/libserver/fuzzy_backend/fuzzy_backend_redis.c
similarity index 100%
rename from src/libserver/fuzzy_backend_redis.c
rename to src/libserver/fuzzy_backend/fuzzy_backend_redis.c

diff --git a/src/libserver/fuzzy_backend_redis.h b/src/libserver/fuzzy_backend/fuzzy_backend_redis.h
similarity index 100%
rename from src/libserver/fuzzy_backend_redis.h
rename to src/libserver/fuzzy_backend/fuzzy_backend_redis.h

diff --git a/src/libserver/fuzzy_backend_sqlite.c b/src/libserver/fuzzy_backend/fuzzy_backend_sqlite.c
similarity index 100%
rename from src/libserver/fuzzy_backend_sqlite.c
rename to src/libserver/fuzzy_backend/fuzzy_backend_sqlite.c

diff --git a/src/libserver/fuzzy_backend_sqlite.h b/src/libserver/fuzzy_backend/fuzzy_backend_sqlite.h
similarity index 100%
rename from src/libserver/fuzzy_backend_sqlite.h
rename to src/libserver/fuzzy_backend/fuzzy_backend_sqlite.h

diff --git a/src/libutil/logger.h b/src/libserver/logger.h
similarity index 100%
rename from src/libutil/logger.h
rename to src/libserver/logger.h

diff --git a/src/libutil/logger.c b/src/libserver/logger/logger.c
similarity index 100%
rename from src/libutil/logger.c
rename to src/libserver/logger/logger.c

diff --git a/src/libutil/logger_console.c b/src/libserver/logger/logger_console.c
similarity index 100%
rename from src/libutil/logger_console.c
rename to src/libserver/logger/logger_console.c

diff --git a/src/libutil/logger_file.c b/src/libserver/logger/logger_file.c
similarity index 100%
rename from src/libutil/logger_file.c
rename to src/libserver/logger/logger_file.c

diff --git a/src/libutil/logger_private.h b/src/libserver/logger/logger_private.h
similarity index 100%
rename from src/libutil/logger_private.h
rename to src/libserver/logger/logger_private.h

diff --git a/src/libutil/logger_syslog.c b/src/libserver/logger/logger_syslog.c
similarity index 100%
rename from src/libutil/logger_syslog.c
rename to src/libserver/logger/logger_syslog.c

diff --git a/src/libutil/CMakeLists.txt b/src/libutil/CMakeLists.txt
index 553d96e4771f62f8d23be7352c9387246dee957b..d26067df1327bf69cd6ef12c7706d6323014677a 100644 (file)
--- a/src/libutil/CMakeLists.txt
+++ b/src/libutil/CMakeLists.txt
@@ -10,10 +10,6 @@ SET(LIBRSPAMDUTILSRC
                                ${CMAKE_CURRENT_SOURCE_DIR}/http_connection.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/http_router.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/http_context.c
-                               ${CMAKE_CURRENT_SOURCE_DIR}/logger.c
-                               ${CMAKE_CURRENT_SOURCE_DIR}/logger_file.c
-                               ${CMAKE_CURRENT_SOURCE_DIR}/logger_syslog.c
-                               ${CMAKE_CURRENT_SOURCE_DIR}/logger_console.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/map.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/map_helpers.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/mem_pool.c

diff --git a/src/libutil/http_message.c b/src/libutil/http_message.c
index ca3523cac45c7904872b02fc0da2b372d6483be0..0e12401a90cf43e5a22e9e0a3d69d95f94cc2609 100644 (file)
--- a/src/libutil/http_message.c
+++ b/src/libutil/http_message.c
@@ -17,7 +17,7 @@
 #include "libutil/http_connection.h"
 #include "libutil/http_private.h"
 #include "libutil/printf.h"
-#include "libutil/logger.h"
+#include "libserver/logger.h"
 #include "utlist.h"
 #include "unix-std.h"
 

diff --git a/src/libutil/http_router.c b/src/libutil/http_router.c
index 8d5913f0d249b36fddffd717fb0c8579f2ea85b5..1e4e656c28e7fcbb487890174a122e0680203da2 100644 (file)
--- a/src/libutil/http_router.c
+++ b/src/libutil/http_router.c
@@ -19,7 +19,7 @@
 #include "libutil/http_private.h"
 #include "libutil/regexp.h"
 #include "libutil/printf.h"
-#include "libutil/logger.h"
+#include "libserver/logger.h"
 #include "utlist.h"
 #include "unix-std.h"
 

diff --git a/src/libutil/sqlite_utils.c b/src/libutil/sqlite_utils.c
index 9c29695426b12f3f7b0b9635a44ee9c8b20964be..9bb0b9c1f2fcd6a2723c778ece6aa56d73db4ec9 100644 (file)
--- a/src/libutil/sqlite_utils.c
+++ b/src/libutil/sqlite_utils.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include "config.h"
-#include "libutil/logger.h"
+#include "libserver/logger.h"
 #include "libutil/sqlite_utils.h"
 #include "unix-std.h"
 

diff --git a/src/libutil/ssl_util.c b/src/libutil/ssl_util.c
index c43ace45453cb7749cb2d48f0451da1945a646a6..4760a3c7867867dc809a6dbb1e5696839df172ac 100644 (file)
--- a/src/libutil/ssl_util.c
+++ b/src/libutil/ssl_util.c
@@ -16,7 +16,7 @@
 
 #include "config.h"
 #include "libutil/util.h"
-#include "libutil/logger.h"
+#include "libserver/logger.h"
 #include "ssl_util.h"
 #include "unix-std.h"
 

diff --git a/src/rspamadm/commands.c b/src/rspamadm/commands.c
index f379ff8022f11362aeec15259f2f860e0ac0c23b..9f243c707fddb3c5b21c47d37df1320ce4944c24 100644 (file)
--- a/src/rspamadm/commands.c
+++ b/src/rspamadm/commands.c
@@ -15,7 +15,7 @@
  */
 #include "rspamadm.h"
 #include "libutil/util.h"
-#include "libutil/logger.h"
+#include "libserver/logger.h"
 #include "lua/lua_common.h"
 #include "lua/lua_thread_pool.h"
 

diff --git a/src/rspamd.h b/src/rspamd.h
index 4e149535abfab09804bd72924d425e9e395ae372..22d9574902178953a781a91ded72dca3fbc74a3c 100644 (file)
--- a/src/rspamd.h
+++ b/src/rspamd.h
@@ -21,7 +21,7 @@
 #include "libutil/fstring.h"
 #include "libutil/mem_pool.h"
 #include "libutil/util.h"
-#include "libutil/logger.h"
+#include "libserver/logger.h"
 #include "libutil/http_connection.h"
 #include "libutil/upstream.h"
 #include "libutil/radix.h"