systemd-python: add Journal method to add MESSAGE_ID match

[elogind.git] / src / python-systemd / _reader.c

diff --git a/src/python-systemd/_reader.c b/src/python-systemd/_reader.c
index 8f21678c81cc4c3fa19b8b22fff5ba966a35079a..b754014e9bc50d8a27bceac0ecdf5a3ba03a4182 100644 (file)
--- a/src/python-systemd/_reader.c
+++ b/src/python-systemd/_reader.c
@@ -57,7 +57,7 @@ Journal_init(Journal *self, PyObject *args, PyObject *keywds)
     char *path=NULL;
 
     static char *kwlist[] = {"flags", "path", NULL};
-    if (! PyArg_ParseTupleAndKeywords(args, keywds, "|is", kwlist,
+    if (! PyArg_ParseTupleAndKeywords(args, keywds, "|iz", kwlist,
                                       &flags, &path))
         return 1;
 
@@ -217,12 +217,11 @@ Journal_get_previous(Journal *self, PyObject *args)
 }
 
 PyDoc_STRVAR(Journal_add_match__doc__,
-"add_match(match, ..., field=value, ...) -> None\n\n"
+"add_match(match) -> None\n\n"
 "Add a match to filter journal log entries. All matches of different\n"
-"field are combined in logical AND, and matches of the same field\n"
+"fields are combined in logical AND, and matches of the same field\n"
 "are automatically combined in logical OR.\n"
-"Matches can be passed as strings \"field=value\", or keyword\n"
-"arguments field=\"value\".");
+"Match is string of form \"field=value\".");
 static PyObject *
 Journal_add_match(Journal *self, PyObject *args, PyObject *keywds)
 {
@@ -327,8 +326,7 @@ Journal_seek(Journal *self, PyObject *args, PyObject *keywds)
         PyErr_SetString(PyExc_ValueError, "Invalid value for whence");
     }
 
-    if (result)
-        Py_DECREF(result);
+    Py_XDECREF(result);
     if (PyErr_Occurred())
         return NULL;
     Py_RETURN_NONE;
@@ -337,15 +335,17 @@ Journal_seek(Journal *self, PyObject *args, PyObject *keywds)
 PyDoc_STRVAR(Journal_seek_realtime__doc__,
 "seek_realtime(realtime) -> None\n\n"
 "Seek to nearest matching journal entry to `realtime`. Argument\n"
-"`realtime` can be an integer unix timestamp in usecs or a "
-"datetime instance.");
+"`realtime` can must be an integer unix timestamp.");
 static PyObject *
 Journal_seek_realtime(Journal *self, PyObject *args)
 {
-    uint64_t timestamp;
-    if (! PyArg_ParseTuple(args, "K", &timestamp))
+    double timedouble;
+    if (! PyArg_ParseTuple(args, "d", &timedouble))
         return NULL;
 
+    uint64_t timestamp;
+    timestamp = (uint64_t) (timedouble * 1.0E6);
+
     if ((int64_t) timestamp < 0LL) {
         PyErr_SetString(PyExc_ValueError, "Time must be positive integer");
         return NULL;
@@ -366,8 +366,7 @@ Journal_seek_realtime(Journal *self, PyObject *args)
 PyDoc_STRVAR(Journal_seek_monotonic__doc__,
 "seek_monotonic(monotonic[, bootid]) -> None\n\n"
 "Seek to nearest matching journal entry to `monotonic`. Argument\n"
-"`monotonic` is an timestamp from boot in secs, or a\n"
-"timedelta instance.\n"
+"`monotonic` is an timestamp from boot in seconds.\n"
 "Argument `bootid` is a string representing which boot the\n"
 "monotonic time is reference to. Defaults to current bootid.");
 static PyObject *
@@ -498,6 +497,8 @@ Journal_iternext(PyObject *self)
     Py_ssize_t dict_size;
 
     dict = PyObject_CallMethod(self, "get_next", "");
+    if (PyErr_Occurred())
+        return NULL;
     dict_size = PyDict_Size(dict);
     if ((int64_t) dict_size > 0LL) {
         return dict;
@@ -508,7 +509,6 @@ Journal_iternext(PyObject *self)
     }
 }
 
-#ifdef SD_JOURNAL_FOREACH_UNIQUE
 PyDoc_STRVAR(Journal_query_unique__doc__,
 "query_unique(field) -> a set of values\n\n"
 "Returns a set of unique values in journal for given `field`.\n"
@@ -554,7 +554,6 @@ Journal_query_unique(Journal *self, PyObject *args)
     Py_DECREF(key);
     return value_set;
 }
-#endif //def SD_JOURNAL_FOREACH_UNIQUE
 
 static PyObject *
 Journal_get_data_threshold(Journal *self, void *closure)
@@ -637,16 +636,14 @@ static PyMethodDef Journal_methods[] = {
     Journal_wait__doc__},
     {"seek_cursor", (PyCFunction)Journal_seek_cursor, METH_VARARGS,
     Journal_seek_cursor__doc__},
-#ifdef SD_JOURNAL_FOREACH_UNIQUE
     {"query_unique", (PyCFunction)Journal_query_unique, METH_VARARGS,
     Journal_query_unique__doc__},
-#endif
     {NULL}  /* Sentinel */
 };
 
 static PyTypeObject JournalType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "_reader.Journal",           /*tp_name*/
+    "_reader._Journal",               /*tp_name*/
     sizeof(Journal),                  /*tp_basicsize*/
     0,                                /*tp_itemsize*/
     (destructor)Journal_dealloc,      /*tp_dealloc*/