From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 29 Jan 2024 16:56:47 +0000 (+0000)
Subject: logging: Make the legacy logger configurable
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=517708c8c76073bebb8997bcdce4e578176355dc;p=people%2Fms%2Fpakfire.git

logging: Make the legacy logger configurable

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c
index 96cdc66d5..a056e3d43 100644
--- a/src/libpakfire/build.c
+++ b/src/libpakfire/build.c
@@ -28,6 +28,9 @@
 #define PCRE2_CODE_UNIT_WIDTH 8
 #include <pcre2.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/build.h>
 #include <pakfire/cgroup.h>
 #include <pakfire/config.h>
diff --git a/src/libpakfire/compress.c b/src/libpakfire/compress.c
index 3de0b9373..8df636d7f 100644
--- a/src/libpakfire/compress.c
+++ b/src/libpakfire/compress.c
@@ -27,6 +27,9 @@
 #include <lzma.h>
 #include <zstd.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/ctx.h>
 #include <pakfire/compress.h>
 #include <pakfire/file.h>
diff --git a/src/libpakfire/db.c b/src/libpakfire/db.c
index 1af9e6de5..f64b82bbf 100644
--- a/src/libpakfire/db.c
+++ b/src/libpakfire/db.c
@@ -27,6 +27,9 @@
 #include <solv/solver.h>
 #include <sqlite3.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/archive.h>
 #include <pakfire/ctx.h>
 #include <pakfire/db.h>
diff --git a/src/libpakfire/dependencies.c b/src/libpakfire/dependencies.c
index 78692a798..9064fb0f6 100644
--- a/src/libpakfire/dependencies.c
+++ b/src/libpakfire/dependencies.c
@@ -26,6 +26,9 @@
 #include <solv/evr.h>
 #include <solv/pool.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/dependencies.h>
 #include <pakfire/logging.h>
 #include <pakfire/package.h>
diff --git a/src/libpakfire/dist.c b/src/libpakfire/dist.c
index b5de7451b..aa6c51eda 100644
--- a/src/libpakfire/dist.c
+++ b/src/libpakfire/dist.c
@@ -25,6 +25,9 @@
 #include <stddef.h>
 #include <stdlib.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/arch.h>
 #include <pakfire/dist.h>
 #include <pakfire/httpclient.h>
diff --git a/src/libpakfire/fhs.c b/src/libpakfire/fhs.c
index a7a622679..2cabb8a0f 100644
--- a/src/libpakfire/fhs.c
+++ b/src/libpakfire/fhs.c
@@ -20,6 +20,9 @@
 
 #include <sys/stat.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/fhs.h>
 #include <pakfire/file.h>
 #include <pakfire/logging.h>
diff --git a/src/libpakfire/file.c b/src/libpakfire/file.c
index 41377ca60..9e73b2788 100644
--- a/src/libpakfire/file.c
+++ b/src/libpakfire/file.c
@@ -35,6 +35,9 @@
 
 #include <gelf.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/ctx.h>
 #include <pakfire/constants.h>
 #include <pakfire/digest.h>
diff --git a/src/libpakfire/filelist.c b/src/libpakfire/filelist.c
index 5f9f1573e..5d8194a0a 100644
--- a/src/libpakfire/filelist.c
+++ b/src/libpakfire/filelist.c
@@ -24,6 +24,9 @@
 
 #include <archive.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/file.h>
 #include <pakfire/filelist.h>
 #include <pakfire/i18n.h>
diff --git a/src/libpakfire/include/pakfire/logging.h b/src/libpakfire/include/pakfire/logging.h
index 508ed5981..643b58d9c 100644
--- a/src/libpakfire/include/pakfire/logging.h
+++ b/src/libpakfire/include/pakfire/logging.h
@@ -59,6 +59,8 @@ static inline void __attribute__((always_inline, format(printf, 2, 3)))
 
 // Below is the legacy logging mechanism
 
+#ifdef PAKFIRE_LEGACY_LOGGING
+
 // This function does absolutely nothing
 static inline void __attribute__((always_inline, format(printf, 2, 3)))
 	pakfire_log_null(struct pakfire* pakfire, const char *format, ...) {}
@@ -80,5 +82,7 @@ static inline void __attribute__((always_inline, format(printf, 2, 3)))
 #	define DEBUG_ERRNO pakfire_log_null
 #endif
 
+#endif /* PAKFIRE_LEGACY_LOGGING */
+
 #endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_LOGGING_H */
diff --git a/src/libpakfire/jail.c b/src/libpakfire/jail.c
index 0f5b6874d..8a61363c3 100644
--- a/src/libpakfire/jail.c
+++ b/src/libpakfire/jail.c
@@ -50,6 +50,9 @@
 // libuuid
 #include <uuid.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/arch.h>
 #include <pakfire/cgroup.h>
 #include <pakfire/jail.h>
diff --git a/src/libpakfire/linter.c b/src/libpakfire/linter.c
index 9cbcc7f96..5b6608f41 100644
--- a/src/libpakfire/linter.c
+++ b/src/libpakfire/linter.c
@@ -18,6 +18,9 @@
 #                                                                             #
 #############################################################################*/
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/linter.h>
 #include <pakfire/logging.h>
 #include <pakfire/package.h>
diff --git a/src/libpakfire/mount.c b/src/libpakfire/mount.c
index 1607478e0..031e42845 100644
--- a/src/libpakfire/mount.c
+++ b/src/libpakfire/mount.c
@@ -26,6 +26,9 @@
 #include <sys/sysmacros.h>
 #include <sys/types.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/arch.h>
 #include <pakfire/logging.h>
 #include <pakfire/pakfire.h>
diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c
index 0b4a3470f..e41f0a1a6 100644
--- a/src/libpakfire/package.c
+++ b/src/libpakfire/package.c
@@ -32,6 +32,9 @@
 #include <solv/repo.h>
 #include <solv/solvable.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/archive.h>
 #include <pakfire/constants.h>
 #include <pakfire/ctx.h>
diff --git a/src/libpakfire/packager.c b/src/libpakfire/packager.c
index 3d37b18f2..f74a97b3b 100644
--- a/src/libpakfire/packager.c
+++ b/src/libpakfire/packager.c
@@ -32,6 +32,9 @@
 
 #include <json.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/archive.h>
 #include <pakfire/compress.h>
 #include <pakfire/constants.h>
diff --git a/src/libpakfire/parser.c b/src/libpakfire/parser.c
index ff9083d24..43fcf4442 100644
--- a/src/libpakfire/parser.c
+++ b/src/libpakfire/parser.c
@@ -30,6 +30,9 @@
 #define PCRE2_CODE_UNIT_WIDTH 8
 #include <pcre2.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/dependencies.h>
 #include <pakfire/jail.h>
 #include <pakfire/logging.h>
diff --git a/src/libpakfire/parser/grammar.y b/src/libpakfire/parser/grammar.y
index b97df9f68..a5a490f0b 100644
--- a/src/libpakfire/parser/grammar.y
+++ b/src/libpakfire/parser/grammar.y
@@ -40,6 +40,9 @@
 #include <stdlib.h>
 #include <time.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/constants.h>
 #include <pakfire/logging.h>
 #include <pakfire/pakfire.h>
diff --git a/src/libpakfire/problem.c b/src/libpakfire/problem.c
index 71adc3d11..d76f0bcc6 100644
--- a/src/libpakfire/problem.c
+++ b/src/libpakfire/problem.c
@@ -21,6 +21,9 @@
 #include <errno.h>
 #include <stdlib.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/constants.h>
 #include <pakfire/dependencies.h>
 #include <pakfire/i18n.h>
diff --git a/src/libpakfire/pwd.c b/src/libpakfire/pwd.c
index 72cfff943..4b40ad430 100644
--- a/src/libpakfire/pwd.c
+++ b/src/libpakfire/pwd.c
@@ -29,6 +29,9 @@
 #include <shadow/subid.h>
 #endif
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/logging.h>
 #include <pakfire/pakfire.h>
 #include <pakfire/pwd.h>
diff --git a/src/libpakfire/repo.c b/src/libpakfire/repo.c
index fc2f8f3c5..4e1043997 100644
--- a/src/libpakfire/repo.c
+++ b/src/libpakfire/repo.c
@@ -31,6 +31,9 @@
 
 #include <json.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/archive.h>
 #include <pakfire/compress.h>
 #include <pakfire/config.h>
diff --git a/src/libpakfire/snapshot.c b/src/libpakfire/snapshot.c
index 83382a182..d4362d8a7 100644
--- a/src/libpakfire/snapshot.c
+++ b/src/libpakfire/snapshot.c
@@ -25,6 +25,9 @@
 
 #include <archive.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/compress.h>
 #include <pakfire/db.h>
 #include <pakfire/file.h>
diff --git a/src/libpakfire/transaction.c b/src/libpakfire/transaction.c
index 9f24306a1..efd87e05f 100644
--- a/src/libpakfire/transaction.c
+++ b/src/libpakfire/transaction.c
@@ -26,6 +26,9 @@
 #include <solv/transaction.h>
 #include <solv/solverdebug.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/archive.h>
 #include <pakfire/ctx.h>
 #include <pakfire/db.h>
diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c
index a3b9f2661..baf421da0 100644
--- a/src/libpakfire/util.c
+++ b/src/libpakfire/util.c
@@ -44,6 +44,9 @@
 #define PCRE2_CODE_UNIT_WIDTH 8
 #include <pcre2.h>
 
+// Enable legacy logging
+#define PAKFIRE_LEGACY_LOGGING
+
 #include <pakfire/ctx.h>
 #include <pakfire/constants.h>
 #include <pakfire/logging.h>