Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

controller manager: enclose controller name in quotes #2761

Merged
merged 1 commit into from
Jul 9, 2021

Conversation

gavanderhoorn
Copy link
Contributor

So empty controller names are easier to spot.

Some MoveIt configurations have the controller name set to "". This is valid (although annoying), but the formatting of the log lines makes it difficult to spot this.

Without the quotes:

Controller  failed with error INVALID_GOAL: ...

With the quotes:

Controller '' failed with error INVALID_GOAL: ...

@gavanderhoorn
Copy link
Contributor Author

Seriously. I add 2 single-quotes and the format check is suddenly failing?

So empty controller names are easier to spot.
<< result->error_string);
ROS_WARN_STREAM_NAMED(LOGNAME, "Controller '" << name_ << "' failed with error "
<< errorCodeToMessage(result->error_code) << ": "
<< result->error_string);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<< result->error_string);
<< result->error_string.empty() ? state.getText() : result->error_string);

maybe? maybe not?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I already fixed it. The formatting job shows the suggested formatting. The << needed to be moved to the right by 1 space.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this wasn't about the formatting but about displaying the generic action error string in case the other one is empty

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/friday_afternoon.

Sorry.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should probably be added in a separate PR though.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hehe, let's not micro-PR things? It's the same topic after all

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hehe, let's not micro-PR things? It's the same topic after all

In theory I agree with @simonschmeisser, but I understand why we should not delay PRs because of other issues in the same code lines. Please create a quick follow-up PR for your improvement Simon! 🏅

@gavanderhoorn
Copy link
Contributor Author

Windows CI is broken afaik.

@codecov
Copy link

codecov bot commented Jul 9, 2021

Codecov Report

Merging #2761 (6590613) into master (c6c0eb4) will decrease coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2761      +/-   ##
==========================================
- Coverage   60.45%   60.44%   -0.01%     
==========================================
  Files         404      404              
  Lines       29670    29670              
==========================================
- Hits        17934    17931       -3     
- Misses      11736    11739       +3     
Impacted Files Coverage Δ
...ipulation/pick_place/src/manipulation_pipeline.cpp 71.85% <0.00%> (-1.94%) ⬇️
...e/collision_detection_fcl/src/collision_common.cpp 77.92% <0.00%> (-0.25%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c6c0eb4...6590613. Read the comment docs.

@v4hn v4hn merged commit a0eeb70 into moveit:master Jul 9, 2021
@v4hn
Copy link
Contributor

v4hn commented Jul 9, 2021

ctrlr mngr: enclose ctrlr name in quotes (#2761)

You lost some vowels there ;)

@gavanderhoorn gavanderhoorn deleted the quotes_around_ctrlr_names branch July 9, 2021 20:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants