Fixed search strategy for python_logging config #1292
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mgrrx
force-pushed
the
fix-search-for-logging-config
branch
from
94fd2ab
to
14fb677
Compare
mikepurvis
approved these changes
Jan 2, 2018
| '/etc/ros/%s'%(fname), | ||
| os.path.join(rosgraph_d, 'conf', fname)]: | ||
| for config_dir in [os.path.join(rospkg.get_ros_home(), 'config'), | ||
| '/etc/ros/', |
There was a problem hiding this comment.
Please use get_etc_ros_dir, since that accounts for the ROS_ETC_DIR envvar:
http://docs.ros.org/independent/api/rospkg/html/rospkg_environment.html#get_etc_ros_dir
| for config_dir in [os.path.join(rospkg.get_ros_home(), 'config'), | ||
| '/etc/ros/', | ||
| os.path.join(rosgraph_d, 'conf')]: | ||
| for extension in ['.conf', '.yaml', '.yml']: |
There was a problem hiding this comment.
Consider os.extsep, but it isn't used a lot elsewhere in ROS tooling, and . works on all of the supported ROS platforms.
mgrrx
force-pushed
the
fix-search-for-logging-config
branch
from
14fb677
to
bb77dc9
Compare
|
Updated as suggested. I played a bit and placed files here and there. And from the code it was somehow obvious that when a file is found, the search ends. |
|
👍 |
|
I don't think we need to introduce the option for Thank you for the patch. This order makes much more sense. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The current strategy tries to first find a file named python_logging.conf and, in case none was found, continues searching the yaml version.
A custom configuration in /etc/ros/python_logging.yaml would be ignored as the file python_logging.conf is always present in the share/conf folder of rosgraph.