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 96cdc66d506c871ebfa840355b02e1adf7c872b7..a056e3d433a2a9cbd523526f21e13fa105351cc5 100644 (file)
--- 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 3de0b93734ce1079ffdfd40f5b48d0fedb6b47b8..8df636d7fd8a8997b3d69f53ddc20bc6cfadddf6 100644 (file)
--- 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 1af9e6de55d4f56bd643252ad9316eecae04c87a..f64b82bbf076d444ca5eea4ab42c328ccb9c3e21 100644 (file)
--- 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 78692a798986288584d32e95c2e2a8ca1e300ff2..9064fb0f659041d2979243c0ef22d5b8d717cc55 100644 (file)
--- 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 b5de7451b5dc6dc6aeb730c595e9d9ff05720b5b..aa6c51eda1602892b3da2a990d183674551dee72 100644 (file)
--- 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 a7a622679f1032ba45e893090c04ea77a80ce327..2cabb8a0f3f563967659919ddf857cc00a4c645d 100644 (file)
--- 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 41377ca603c9f3a651262d59027872085236e846..9e73b27889eea87dac8a43801232d2e42fc19417 100644 (file)
--- 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 5f9f1573eb71976e398b62813ee06986a36df3a1..5d8194a0abf2ca6351ca40926e4f4f7bc25232d6 100644 (file)
--- 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 508ed598148b6af13b992ecd77cffd7c40c7604b..643b58d9c68301de44eb4d05fbb9ac53b38fb6f9 100644 (file)
--- 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 0f5b6874d36bef1226ed653d1894371efe89a5bc..8a61363c36bf880c2a7504637df0b5fb6435ddd1 100644 (file)
--- 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 9cbcc7f96b325f9f337f90d797ef5c75df687990..5b6608f4119f7c5d259f7cc949e839e640b6de09 100644 (file)
--- 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 1607478e02e9611decd1b88c5a7bcfdc44a79d3e..031e428455c7b8a7603ffb15850410456f97f783 100644 (file)
--- 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 0b4a3470ff39d4e25fadd1a0bf3e657ad5d9d569..e41f0a1a6c0a3d4fb41485d70bf65fc160288bff 100644 (file)
--- 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 3d37b18f2361ded98d2591bf46a6629cd5ae2b88..f74a97b3b562bdf20de58f257bbbd4e8ee23ca79 100644 (file)
--- 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 ff9083d248705ae691c35ee41e3773edc43323c7..43fcf4442af57bc647a58da759a687d151e22b6f 100644 (file)
--- 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 b97df9f68bb106717da48e57b7005eed2b29d77c..a5a490f0bfa45eeac7b9d12668953a8fd5bd58b5 100644 (file)
--- 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 71adc3d1112e80d99e647c576c0ac498fe1b88ce..d76f0bcc6575c39b0ab3b883ec75bd4aaac16915 100644 (file)
--- 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 72cfff9438b03fb23d07e103a8e4d6fa8c3fae26..4b40ad4308e6d690ace0b3a97a5202044b1148f0 100644 (file)
--- 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 fc2f8f3c5acc171092b7219ba80964b1e5e58db4..4e1043997cc754e50bdc6be5e64a98830b74ab2f 100644 (file)
--- 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 83382a1826e47948a43326b5ad2998840b8544ae..d4362d8a786bda4d6f2467bce870e1b4ab8b28c2 100644 (file)
--- 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 9f24306a11f4db8d66faedec12fe8036c3ef1129..efd87e05f91eba39ebf22365376ee10a9137216d 100644 (file)
--- 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 a3b9f266136eca2109bfcdfa344809ba50f0a3ab..baf421da0b8a3c3b37837c88c5933684d5baf98f 100644 (file)
--- 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>