Consolidate logfile naming and destination filename #17438
Conversation
| @@ -180,10 +180,17 @@ def destination_directory | |||
| File.join("#{resource.zone.name}_#{resource.zone.id}", "#{resource.name}_#{resource.id}") | |||
| end | |||
|
|
|||
| def self.logfile_name(resource, category = "Current", date_string = nil) | |||
| region = MiqRegion.my_region.try(:region) || "unknown" | |||
| [category, "region", region, resource.zone.name, resource.zone.id, resource.name, resource.id, date_string].compact.join(" ") | |||
There was a problem hiding this comment.
Why the .compact? Could anything be nil?
There was a problem hiding this comment.
logfile_name is being used for non-log related materials such as automate dialogs/domains. date_string will be nil for them, but also in the unlikely event we couldn't find timestamps in the evm.log or compressed version of the evm.log.
| end | ||
|
|
||
| def name | ||
| super || self.class.logfile_name(resource) |
There was a problem hiding this comment.
Any reason not to use the underscorized version?
There was a problem hiding this comment.
Not really. I was trying to minimize change of the LogFile#name and it made sense to use underscores for a filename but didn't matter for LogFile#name.
https://bugzilla.redhat.com/show_bug.cgi?id=1535179 Builds on top of the refactoring of current/historical log collection found in: ManageIQ#17437 LogFile#name was generating a name that was similar but yet different than the destination_file_name. This name is not displayed or used in the UI, so we can push the logic of building the destination_file_name into the name of the LogFile, which is exactly the place we need it to differentiate current/historical/automate models/automate dialogs.
jrafanie
force-pushed
the
consolidate_logfile_naming_and_destination_filename
branch
from
5133cb0
to
53f2b84
Compare
jrafanie
changed the title
|
Checked commits jrafanie/manageiq@3625847~...53f2b84 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 spec/models/file_depot_ftp_spec.rb
spec/models/miq_server/log_management_spec.rb
|
|
This is now ready to go after rebasing. WIP removed. Note, the COPs will be addressed in #17445 |
https://bugzilla.redhat.com/show_bug.cgi?id=1535179
Depends on prior PRs:
LogFile#name was generating a name that was similar but yet different
than the destination_file_name. This name is not displayed or used in
the UI, so we can push the logic of building the destination_file_name
into the name of the LogFile, which is exactly the place we need it to
differentiate current/historical/automate models/automate dialogs.