Logging function for rospy with node/func named msg

clients/rospy/src/rospy/__init__.py

@@ -58,6 +58,9 @@
     get_node_uri, get_ros_root, \
     logdebug, logwarn, loginfo, logout, logerr, logfatal, \
     logdebug_throttle, logwarn_throttle, loginfo_throttle, logerr_throttle, logfatal_throttle, \
+    logdebug_func_named, logwarn_func_named, loginfo_func_named, logerr_func_named, logfatal_func_named, \
+    logdebug_node_named, logwarn_node_named, loginfo_node_named, logerr_node_named, logfatal_node_named, \
+    logdebug_node_func_named, logwarn_node_func_named, loginfo_node_func_named, logerr_node_func_named, logfatal_node_func_named, \
     parse_rosrpc_uri
 from .exceptions import *
 from .msg import AnyMsg

clients/rospy/src/rospy/core.py

@@ -215,6 +215,82 @@ def logfatal_throttle(period, msg):
     caller_id = _frame_record_to_caller_id(inspect.stack()[1])
     _logging_throttle(caller_id, logfatal, period, msg)
 
+
+def _log_msg_func_named(msg):
+    try:
+        return '[{cls}::{method}] {msg}'.format(
+            cls=inspect.stack()[2][0].f_locals['self'].__class__.__name__,
+            method=inspect.stack()[2][0].f_code.co_name,
+            msg=msg)
+    except KeyError:
+        return '[{func}] {msg}'.format(
+            func=inspect.stack()[2][0].f_code.co_name,
+            msg=msg)
+
+
+def logdebug_func_named(*msg):
+    logdebug(*[_log_msg_func_named(msg[0])] + list(msg[1:]))
+
+
+def loginfo_func_named(*msg):
+    loginfo(*[_log_msg_func_named(msg[0])] + list(msg[1:]))
+
+
+def logwarn_func_named(*msg):
+    logwarn(*[_log_msg_func_named(msg[0])] + list(msg[1:]))
+
+
+def logerr_func_named(*msg):
+    logerr(*[_log_msg_func_named(msg[0])] + list(msg[1:]))
+
+
+def logfatal_func_named(*msg):
+    logfatal(*[_log_msg_func_named(msg[0])] + list(msg[1:]))
+
+
+def _log_msg_node_named(msg):
+    return '[{node}] {msg}'.format(node=rospy.get_name(), msg=msg)
+
+
+def logdebug_node_named(*msg):
+    logdebug(*[_log_msg_node_named(msg[0])] + list(msg[1:]))
+
+
+def loginfo_node_named(*msg):
+    loginfo(*[_log_msg_node_named(msg[0])] + list(msg[1:]))
+
+
+def logwarn_node_named(*msg):
+    logwarn(*[_log_msg_node_named(msg[0])] + list(msg[1:]))
+
+
+def logerr_node_named(*msg):
+    logerr(*[_log_msg_node_named(msg[0])] + list(msg[1:]))
+
+
+def logfatal_node_named(*msg):
+    logfatal(*[_log_msg_func_named(msg[0])] + list(msg[1:]))
+
+
+def logdebug_node_func_named(*msg):
+    logdebug(*[_log_msg_node_named(_log_msg_func_named(msg[0]))] + list(msg[1:]))
+
+
+def loginfo_node_func_named(*msg):
+    loginfo(*[_log_msg_node_named(_log_msg_func_named(msg[0]))] + list(msg[1:]))
+
+
+def logwarn_node_func_named(*msg):
+    logwarn(*[_log_msg_node_named(_log_msg_func_named(msg[0]))] + list(msg[1:]))
+
+
+def logerr_node_func_named(*msg):
+    logerr(*[_log_msg_node_named(_log_msg_func_named(msg[0]))] + list(msg[1:]))
+
+
+def logfatal_node_func_named(*msg):
+    logfatal(*[_log_msg_node_named(_log_msg_func_named(msg[0]))] + list(msg[1:]))
+
 
 #########################################################
 # CONSTANTS