stop upload if Satellite setting is disconnected #312
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
ShimShtein
requested changes
Aug 19, 2020
| Open3.popen2e(hash_to_s(env), *preprocess_command(command)) do |_stdin, stdout_stderr, wait_thread| | ||
| progress_output.status = "Running in pid #{wait_thread.pid}" | ||
| progress_output_for(instance_label) do |progress_output| | ||
| Open3.popen2e(hash_to_s(env), *preprocess_command(command)) do |stdin, stdout_stderr, wait_thread| |
There was a problem hiding this comment.
Suggested change
| Open3.popen2e(hash_to_s(env), *preprocess_command(command)) do |stdin, stdout_stderr, wait_thread| | |
| Open3.popen2e(hash_to_s(env), *preprocess_command(command)) do |_stdin, stdout_stderr, wait_thread| |
we do not use stdin parameter.
There was a problem hiding this comment.
interesting why rubocop didn't catch it either
Ron-Lavi
force-pushed
the
stop_upload_disconnected
branch
from
fee65e3
to
2a9f359
Compare
|
Thanks @ShimShtein, updated |
ShimShtein
requested changes
Aug 19, 2020
| label = UploadReportJob.output_label(organization_id) | ||
| if Setting[:content_disconnected] | ||
| progress_output_for(label) do |progress_output| | ||
| progress_output.write_line('Upload was stopped since this disconnected setting is enabled') |
There was a problem hiding this comment.
Suggested change
| progress_output.write_line('Upload was stopped since this disconnected setting is enabled') | |
| progress_output.write_line('Upload was stopped since disconnected mode setting is enabled for content on this instance.') |
There was a problem hiding this comment.
Fixed, thanks it sounds better 👍
Ron-Lavi
force-pushed
the
stop_upload_disconnected
branch
from
2a9f359
to
24da4b0
Compare
Ron-Lavi
force-pushed
the
stop_upload_disconnected
branch
from
24da4b0
to
dc1cee0
Compare
Ron-Lavi
added a commit
to Ron-Lavi/foreman_rh_cloud
that referenced
this pull request
Aug 20, 2020
(cherry picked from commit 8aea2ce) Conflicts: lib/foreman_inventory_upload/async/shell_process.rb
Ron-Lavi
added a commit
to Ron-Lavi/foreman_rh_cloud
that referenced
this pull request
Aug 20, 2020
(cherry picked from commit 8aea2ce) Conflicts: lib/foreman_inventory_upload/async/shell_process.rb
ShimShtein
pushed a commit
that referenced
this pull request
Aug 20, 2020
ShimShtein
pushed a commit
that referenced
this pull request
Aug 20, 2020
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.
No description provided.