Fix log copy #252
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,142 +1,3 @@ | ||
| require "installation/copy_logs_finish" | ||
|
|
||
| ::Installation::CopyLogsFinish.run |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| # ------------------------------------------------------------------------------ | ||
| # Copyright (c) 2006-2015 Novell, Inc. All Rights Reserved. | ||
| # | ||
| # | ||
| # This program is free software; you can redistribute it and/or modify it under | ||
| # the terms of version 2 of the GNU General Public License as published by the | ||
| # Free Software Foundation. | ||
| # | ||
| # This program is distributed in the hope that it will be useful, but WITHOUT | ||
| # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
| # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License along with | ||
| # this program; if not, contact Novell, Inc. | ||
| # | ||
| # To contact Novell about this file by physical or electronic mail, you may find | ||
| # current contact information at www.novell.com. | ||
| # ------------------------------------------------------------------------------ | ||
|
|
||
| require "yast" | ||
|
|
||
| require "installation/finish_client" | ||
|
|
||
| module Installation | ||
| class CopyLogsFinish < ::Installation::FinishClient | ||
| include Yast::I18n | ||
|
|
||
| LOCAL_BASH = Yast::Path.new(".local.bash") | ||
|
|
||
| def initialize | ||
| textdomain "installation" | ||
|
|
||
| Yast.import "Directory" | ||
| Yast.import "Installation" | ||
| end | ||
|
|
||
| def steps | ||
| 1 | ||
| end | ||
|
|
||
| def title | ||
| _("Copying log files to installed system...") | ||
| end | ||
|
|
||
| def modes | ||
| [:installation, :live_installation, :update, :autoinst] | ||
| end | ||
|
|
||
| def write | ||
| log_files = Yast::WFM.Read(Yast::Path.new(".local.dir"), Yast::Directory.logdir) | ||
|
|
||
| log_files.each do |file| | ||
| log.debug "Processing file #{file}" | ||
|
|
||
| case file | ||
| when "y2log", /\Ay2log-\d+\z/ | ||
| # Prepare y2log, y2log-* for log rotation | ||
| target_no = 1 | ||
|
|
||
| if file != "y2log" | ||
| prefix_size = "y2log-".size | ||
| target_no = file[prefix_size..-1].to_i + 1 | ||
| end | ||
|
|
||
| target_basename = "y2log-#{target_no}" | ||
| copy_log_to_target(file, target_basename) | ||
|
|
||
| target_path = ::File.join( | ||
| Yast::Installation.destdir, | ||
| Yast::Directory.logdir, | ||
| target_basename | ||
| ) | ||
| compress_cmd = "gzip -f #{target_path}" | ||
|
There was a problem hiding this comment. Maybe a comment here to justify the |
||
| log.debug "Compress command: #{compress_cmd}" | ||
| Yast::WFM.Execute(LOCAL_BASH, compress_cmd) | ||
| when /\Ay2log-\d+\.gz\z/ | ||
| target_no = file[/y2log-(\d+)/, 1].to_i + 1 | ||
| copy_log_to_target(file, "y2log-#{target_no}.gz") | ||
| when "zypp.log" | ||
| # Save zypp.log from the inst-sys | ||
| copy_log_to_target(file, "zypp.log-1") # not y2log, y2log-* | ||
| else | ||
| copy_log_to_target(file) | ||
| end | ||
| end | ||
|
|
||
| copy_cmd = "/bin/cp /var/log/pbl.log '#{Yast::Installation.destdir}/#{Yast::Directory.logdir}/pbl-instsys.log'" | ||
| log.debug "Copy command: #{copy_cmd}" | ||
| Yast::WFM.Execute(LOCAL_BASH, copy_cmd) | ||
|
|
||
| nil | ||
| end | ||
|
|
||
| private | ||
|
|
||
| def copy_log_to_target(src_file, dst_file = src_file) | ||
| dir = Yast::Directory.logdir | ||
| src_path = "#{dir}/#{src_file}" | ||
| dst_path = "#{Yast::Installation.destdir}/#{dir}/#{dst_file}" | ||
| command = "/bin/cp #{src_path} #{dst_path}" | ||
|
|
||
| log.info "copy log with '#{command}'" | ||
|
|
||
| Yast::WFM.Execute(LOCAL_BASH, command) | ||
| end | ||
| end | ||
| end | ||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| #! /usr/bin/env rspec | ||
|
|
||
| require_relative "./test_helper" | ||
|
|
||
| require "installation/copy_logs_finish" | ||
|
|
||
| describe ::Installation::CopyLogsFinish do | ||
| describe "#write" do | ||
| before do | ||
| allow(Yast::WFM).to receive(:Execute) | ||
| end | ||
|
|
||
| it "copies logs from instalation to target system" do | ||
| allow(Yast::WFM).to receive(:Read).and_return(["y2start.log"]) | ||
|
There was a problem hiding this comment. Without reading the implementation code, the purpose of this What about using There was a problem hiding this comment. I am also considering it and if you get same idea I will do it. |
||
|
|
||
| expect(Yast::WFM).to receive(:Execute).with(anything(), /cp/).at_least(:once) | ||
|
There was a problem hiding this comment. The y2start.log returned by the previous call is not used in the expectation. Feels strange. There was a problem hiding this comment. fair comment. I will add it. |
||
|
|
||
| subject.write | ||
| end | ||
|
|
||
| it "rotate y2log" do | ||
|
|
||
| allow(Yast::WFM).to receive(:Read).and_return(["y2log-1.gz"]) | ||
|
|
||
| expect(Yast::WFM).to receive(:Execute).with(anything(), /cp .*y2log-1.gz .*y2log-2.gz/) | ||
|
|
||
| subject.write | ||
| end | ||
|
|
||
| it "compress y2log if not already done" do | ||
|
There was a problem hiding this comment. "compresses"... and "does" (in the next one) and "rotates" (last one). |
||
| allow(Yast::WFM).to receive(:Read).and_return(["y2log-1"]) | ||
|
|
||
| expect(Yast::WFM).to receive(:Execute).with(anything(), /gzip .*y2log-2/) #-2 due to rotation | ||
|
There was a problem hiding this comment.
There was a problem hiding this comment. yep, maybe time to finally find time to have generic rspec helper for SCR in yast2 or ruby bindings |
||
|
|
||
| subject.write | ||
| end | ||
|
|
||
| it "do not stuck during compress if file already exists (bnc#897091)" do | ||
| allow(Yast::WFM).to receive(:Read).and_return(["y2log-1"]) | ||
|
|
||
| expect(Yast::WFM).to receive(:Execute).with(anything(), /gzip -f/) | ||
|
|
||
| subject.write | ||
| end | ||
|
|
||
| it "rotate zypp.log" do | ||
| allow(Yast::WFM).to receive(:Read).and_return(["zypp.log"]) | ||
|
|
||
| expect(Yast::WFM).to receive(:Execute).with(anything(), /cp .*zypp.log .*zypp.log-1/) | ||
|
|
||
| subject.write | ||
| end | ||
| end | ||
| end | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just asking. Do we have any convention on naming all these clients living under
lib/installation? Like always usingWhateverFinishfor clients inheriting fromFinishClient?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
actually no convention...in bootloader it is simple
Bootloader/FinishClientbut here it can create collisions so I name it this way.CopyLogswithout finish can confuse reader as it can be seen as common class to copy logs from one place to another.