Skip to content

Commit 1f20db1

Browse files
committed
reader: add missing flags for sd_journal_open*()
1 parent cd2ccd5 commit 1f20db1

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

src/systemd/_reader.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,19 @@
2222
#define HAVE_HAS_RUNTIME_FILES (LIBSYSTEMD_VERSION >= 229)
2323
#define HAVE_HAS_PERSISTENT_FILES (LIBSYSTEMD_VERSION >= 229)
2424

25+
#if LIBSYSTEMD_VERSION < 256
26+
# define SD_JOURNAL_ASSUME_IMMUTABLE (1 << 8)
27+
#endif
28+
29+
#if LIBSYSTEMD_VERSION < 254
30+
# define SD_JOURNAL_TAKE_DIRECTORY_FD (1 << 7)
31+
#endif
32+
2533
#if LIBSYSTEMD_VERSION >= 245
2634
# define HAVE_JOURNAL_OPEN_NAMESPACE 1
2735
#else
36+
# define SD_JOURNAL_ALL_NAMESPACES (1 << 5)
37+
# define SD_JOURNAL_INCLUDE_DEFAULT_NAMESPACE (1 << 6)
2838
# define HAVE_JOURNAL_OPEN_NAMESPACE 0
2939
#endif
3040

@@ -1422,6 +1432,10 @@ PyInit__reader(void)
14221432
PyModule_AddIntConstant(m, "SYSTEM_ONLY", SD_JOURNAL_SYSTEM) ||
14231433
PyModule_AddIntConstant(m, "CURRENT_USER", SD_JOURNAL_CURRENT_USER) ||
14241434
PyModule_AddIntConstant(m, "OS_ROOT", SD_JOURNAL_OS_ROOT) ||
1435+
PyModule_AddIntConstant(m, "ALL_NAMESPACES", SD_JOURNAL_ALL_NAMESPACES) ||
1436+
PyModule_AddIntConstant(m, "INCLUDE_DEFAULT_NAMESPACE", SD_JOURNAL_INCLUDE_DEFAULT_NAMESPACE) ||
1437+
PyModule_AddIntConstant(m, "TAKE_DIRECTORY_FD", SD_JOURNAL_TAKE_DIRECTORY_FD) ||
1438+
PyModule_AddIntConstant(m, "ASSUME_IMMUTABLE", SD_JOURNAL_ASSUME_IMMUTABLE) ||
14251439
PyModule_AddStringConstant(m, "__version__", PACKAGE_VERSION)) {
14261440
Py_DECREF(m);
14271441
return NULL;

src/systemd/journal.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
from ._reader import (_Reader, NOP, APPEND, INVALIDATE,
1414
LOCAL_ONLY, RUNTIME_ONLY,
1515
SYSTEM, SYSTEM_ONLY, CURRENT_USER,
16-
OS_ROOT,
16+
OS_ROOT, ALL_NAMESPACES, INCLUDE_DEFAULT_NAMESPACE,
17+
TAKE_DIRECTORY_FD, ASSUME_IMMUTABLE, SYSTEM_ONLY,
1718
_get_catalog, Monotonic)
1819
from . import id128 as _id128
1920

0 commit comments

Comments
 (0)