} Journal;
static PyTypeObject JournalType;
+static int set_error(int r, const char* path, const char* invalid_message) {
+ if (r >= 0)
+ return r;
+ if (r == -EINVAL && invalid_message)
+ PyErr_SetString(PyExc_ValueError, invalid_message);
+ else if (r == -ENOMEM)
+ PyErr_SetString(PyExc_MemoryError, "Not enough memory");
+ else {
+ errno = -r;
+ PyErr_SetFromErrnoWithFilename(PyExc_OSError, path);
+ }
+ return 1;
+}
+
static void
Journal_dealloc(Journal* self)
{
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;
r = sd_journal_open(&self->j, flags);
}
Py_END_ALLOW_THREADS
- if (r < 0) {
- errno = -r;
- PyObject *errtype = r == -EINVAL ? PyExc_ValueError :
- r == -ENOMEM ? PyExc_MemoryError :
- PyExc_OSError;
- PyErr_SetFromErrnoWithFilename(errtype, path);
- return -1;
- }
- return 0;
+ return set_error(r, path, "Invalid flags or path");
}
PyDoc_STRVAR(Journal_get_next__doc__,
}
Py_END_ALLOW_THREADS
- if (r < 0) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
+ set_error(r, NULL, NULL);
+ if (r < 0)
return NULL;
- }else if ( r == 0) { //EOF
+ else if (r == 0) /* EOF */
return PyDict_New();
- }
PyObject *dict;
dict = PyDict_New();
}
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)
{
int r;
r = sd_journal_add_match(self->j, match, match_len);
- if (r < 0) {
- errno = -r;
- PyObject *errtype = r == -EINVAL ? PyExc_ValueError :
- r == -ENOMEM ? PyExc_MemoryError :
- PyExc_OSError;
- PyErr_SetFromErrno(errtype);
- return NULL;
- }
+ set_error(r, NULL, "Invalid match");
+ if (r < 0)
+ return NULL;
Py_RETURN_NONE;
}
{
int r;
r = sd_journal_add_disjunction(self->j);
- if (r < 0) {
- errno = -r;
- PyObject *errtype = r == -ENOMEM ? PyExc_MemoryError :
- PyExc_OSError;
- PyErr_SetFromErrno(errtype);
+ set_error(r, NULL, NULL);
+ if (r < 0)
return NULL;
- }
Py_RETURN_NONE;
}
Py_BEGIN_ALLOW_THREADS
r = sd_journal_seek_head(self->j);
Py_END_ALLOW_THREADS
- if (r < 0) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
+ if (set_error(r, NULL, NULL))
return NULL;
- }
+
if (offset > 0LL) {
result = PyObject_CallMethod((PyObject *)self, "get_next", "L", offset);
}
Py_BEGIN_ALLOW_THREADS
r = sd_journal_seek_tail(self->j);
Py_END_ALLOW_THREADS
- if (r < 0) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
+ if (set_error(r, NULL, NULL))
return NULL;
- }
+
if (offset < 0LL) {
result = PyObject_CallMethod((PyObject *)self, "get_next", "L", offset);
}else{
PyErr_SetString(PyExc_ValueError, "Invalid value for whence");
}
- if (result)
- Py_DECREF(result);
+ Py_XDECREF(result);
if (PyErr_Occurred())
return NULL;
Py_RETURN_NONE;
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", ×tamp))
+ 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;
Py_BEGIN_ALLOW_THREADS
r = sd_journal_seek_realtime_usec(self->j, timestamp);
Py_END_ALLOW_THREADS
- if (r < 0) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
+ if (set_error(r, NULL, NULL))
return NULL;
- }
Py_RETURN_NONE;
}
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 *
int r;
if (bootid) {
r = sd_id128_from_string(bootid, &sd_id);
- if (r == -EINVAL) {
- PyErr_SetString(PyExc_ValueError, "Invalid bootid");
- return NULL;
- }else if (r < 0) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
+ if (set_error(r, NULL, "Invalid bootid"))
return NULL;
- }
- }else{
+ } else {
+ Py_BEGIN_ALLOW_THREADS
r = sd_id128_get_boot(&sd_id);
- if (r == -EIO) {
- PyErr_SetString(PyExc_IOError, "Error getting current boot ID");
- return NULL;
- }else if (r < 0) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
+ Py_END_ALLOW_THREADS
+ if (set_error(r, NULL, NULL))
return NULL;
- }
}
Py_BEGIN_ALLOW_THREADS
r = sd_journal_seek_monotonic_usec(self->j, sd_id, timestamp);
Py_END_ALLOW_THREADS
- if (r < 0) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
+ if (set_error(r, NULL, NULL))
return NULL;
- }
Py_RETURN_NONE;
}
-
+
PyDoc_STRVAR(Journal_wait__doc__,
"wait([timeout]) -> Change state (integer)\n\n"
"Waits until there is a change in the journal. Argument `timeout`\n"
int r;
Py_BEGIN_ALLOW_THREADS
- if ( timeout == 0LL) {
- r = sd_journal_wait(self->j, (uint64_t) -1);
- }else{
- r = sd_journal_wait(self->j, timeout * 1E6);
- }
+ r = sd_journal_wait(self->j, timeout ==0 ? (uint64_t) -1 : timeout * 1E6);
Py_END_ALLOW_THREADS
- if (r < 0) {
- errno = -r;
- PyObject *errtype = r == -ENOMEM ? PyExc_MemoryError :
- PyExc_OSError;
- PyErr_SetFromErrno(errtype);
+ if (set_error(r, NULL, NULL))
return NULL;
- }
+
#if PY_MAJOR_VERSION >=3
return PyLong_FromLong(r);
#else
Py_BEGIN_ALLOW_THREADS
r = sd_journal_seek_cursor(self->j, cursor);
Py_END_ALLOW_THREADS
- if (r < 0) {
- errno = -r;
- PyObject *errtype = r == -EINVAL ? PyExc_ValueError :
- r == -ENOMEM ? PyExc_MemoryError :
- PyExc_OSError;
- PyErr_SetFromErrno(errtype);
+ if (set_error(r, NULL, "Invalid cursor"))
return NULL;
- }
Py_RETURN_NONE;
}
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;
}
}
-#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"
Py_BEGIN_ALLOW_THREADS
r = sd_journal_query_unique(self->j, query);
Py_END_ALLOW_THREADS
- if (r < 0) {
- errno = -r;
- PyObject *errtype = r == -EINVAL ? PyExc_ValueError :
- r == -ENOMEM ? PyExc_MemoryError :
- PyExc_OSError;
- PyErr_SetFromErrno(errtype);
+ if (set_error(r, NULL, "Invalid field name"))
return NULL;
- }
const void *uniq;
size_t uniq_len;
Py_DECREF(key);
return value_set;
}
-#endif //def SD_JOURNAL_FOREACH_UNIQUE
static PyObject *
Journal_get_data_threshold(Journal *self, void *closure)
int r;
r = sd_journal_get_data_threshold(self->j, &cvalue);
- if (r < 0) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
+ if (set_error(r, NULL, NULL))
return NULL;
- }
#if PY_MAJOR_VERSION >=3
value = PyLong_FromSize_t(cvalue);
#else
r = sd_journal_set_data_threshold(self->j, (size_t) PyInt_AsLong(value));
#endif
- if (r < 0) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
- return -1;
- }
- return 0;
+ return set_error(r, NULL, NULL);
}
static PyGetSetDef Journal_getseters[] = {
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*/
~ianmdlvl / elogind.git / blobdiff