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.

Sign up for GitHub

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

Sort array of queue names #16400

Merged
merged 1 commit into from
Nov 6, 2017
Merged

Sort array of queue names #16400

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/models/miq_worker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ def self.close_pg_sockets_inherited_from_parent
# This converts it back to a Ruby Array safely.
def queue_name
begin
JSON.parse(self[:queue_name])
JSON.parse(self[:queue_name]).sort
Copy link
Member

Choose a reason for hiding this comment

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

Will this handle a single queue_name that's not an array?

Copy link
Member Author

Choose a reason for hiding this comment

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

@Fryguy that happens here https://github.com/juliancheal/manageiq/blob/db6a096ebd97d09ab0a58d41c5518e3f69a46d58/app/models/miq_worker.rb#L340-L342 If JSON tries to parse a string.

rescue JSON::ParserError, TypeError
self[:queue_name]
end
Expand Down