Skip to content

Commit

Permalink
Make use of rcutils log severity defined enum instead of duplicating …
Browse files Browse the repository at this point in the history
…code (ros2#468)

* Make use of rcutils log severity defined enum instead of duplicating code

Signed-off-by: Brian Ezequiel Marchi <brian.marchi65@gmail.com>
Signed-off-by: AbhinavSingh <singhabhinav9051571833@gmail.com>
  • Loading branch information
BMarchi authored and suab321321 committed Jan 31, 2020
1 parent c4d28f9 commit 9fa3bc7
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 6 deletions.
12 changes: 6 additions & 6 deletions rclpy/rclpy/logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ class LoggingSeverity(IntEnum):
This enum must match the one defined in rcutils/logging.h
"""

UNSET = 0
DEBUG = 10
INFO = 20
WARN = 30
ERROR = 40
FATAL = 50
UNSET = _rclpy_logging.rclpy_get_unset_logging_severity()
DEBUG = _rclpy_logging.rclpy_get_debug_logging_severity()
INFO = _rclpy_logging.rclpy_get_info_logging_severity()
WARN = _rclpy_logging.rclpy_get_warn_logging_severity()
ERROR = _rclpy_logging.rclpy_get_error_logging_severity()
FATAL = _rclpy_logging.rclpy_get_fatal_logging_severity()


_root_logger = rclpy.impl.rcutils_logger.RcutilsLogger()
Expand Down
72 changes: 72 additions & 0 deletions rclpy/src/rclpy/_rclpy_logging.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,54 @@ rclpy_logging_severity_level_from_string(PyObject * Py_UNUSED(self), PyObject *
return PyLong_FromLongLong(severity);
}

/// Get log unset severity level as int from rcutils.
/// \return RCUTILS_LOG_SEVERITY_UNSET as a PyLong.
static PyObject *
rclpy_get_unset_logging_severity(PyObject * Py_UNUSED(self), PyObject * Py_UNUSED(args))
{
return PyLong_FromLongLong(RCUTILS_LOG_SEVERITY_UNSET);
}

/// Get log debug severity level as int from rcutils.
/// \return RCUTILS_LOG_SEVERITY_DEBUG as a PyLong.
static PyObject *
rclpy_get_debug_logging_severity(PyObject * Py_UNUSED(self), PyObject * Py_UNUSED(args))
{
return PyLong_FromLongLong(RCUTILS_LOG_SEVERITY_DEBUG);
}

/// Get log info severity level as int from rcutils.
/// \return RCUTILS_LOG_SEVERITY_INFO as a PyLong.
static PyObject *
rclpy_get_info_logging_severity(PyObject * Py_UNUSED(self), PyObject * Py_UNUSED(args))
{
return PyLong_FromLongLong(RCUTILS_LOG_SEVERITY_INFO);
}

/// Get log warn severity level as int from rcutils
/// \return RCUTILS_LOG_SEVERITY_WARN as a PyLong.
static PyObject *
rclpy_get_warn_logging_severity(PyObject * Py_UNUSED(self), PyObject * Py_UNUSED(args))
{
return PyLong_FromLongLong(RCUTILS_LOG_SEVERITY_WARN);
}

/// Get log error severity level as int from rcutils
/// \return RCUTILS_LOG_SEVERITY_ERROR as a PyLong.
static PyObject *
rclpy_get_error_logging_severity(PyObject * Py_UNUSED(self), PyObject * Py_UNUSED(args))
{
return PyLong_FromLongLong(RCUTILS_LOG_SEVERITY_ERROR);
}

/// Get log fatal severity level as int from rcutils.
/// \return RCUTILS_LOG_SEVERITY_FATAL as a PyLong.
static PyObject *
rclpy_get_fatal_logging_severity(PyObject * Py_UNUSED(self), PyObject * Py_UNUSED(args))
{
return PyLong_FromLongLong(RCUTILS_LOG_SEVERITY_FATAL);
}

/// Define the public methods of this module
static PyMethodDef rclpy_logging_methods[] = {
{
Expand Down Expand Up @@ -230,6 +278,30 @@ static PyMethodDef rclpy_logging_methods[] = {
"rclpy_logging_severity_level_from_string", rclpy_logging_severity_level_from_string,
METH_VARARGS, "Determine log level from string"
},
{
"rclpy_get_unset_logging_severity", rclpy_get_unset_logging_severity,
METH_VARARGS, "Get log unset severity level as int from rcutils"
},
{
"rclpy_get_debug_logging_severity", rclpy_get_debug_logging_severity,
METH_VARARGS, "Get log debug severity level as int from rcutils"
},
{
"rclpy_get_info_logging_severity", rclpy_get_info_logging_severity,
METH_VARARGS, "Get log info severity level as int from rcutils"
},
{
"rclpy_get_warn_logging_severity", rclpy_get_warn_logging_severity,
METH_VARARGS, "Get log warn severity level as int from rcutils"
},
{
"rclpy_get_error_logging_severity", rclpy_get_error_logging_severity,
METH_VARARGS, "Get log error severity level as int from rcutils"
},
{
"rclpy_get_fatal_logging_severity", rclpy_get_fatal_logging_severity,
METH_VARARGS, "Get log fatal severity level as int from rcutils"
},

{NULL, NULL, 0, NULL} /* sentinel */
};
Expand Down

0 comments on commit 9fa3bc7

Please sign in to comment.