Skip to content

Commit

Permalink
Merge pull request #4577 from ChrisBr/cloud/uploader
Browse files Browse the repository at this point in the history
[backend] Fix typo in clouduploader
  • Loading branch information
DavidKang committed Feb 26, 2018
2 parents 52e787d + 5035b79 commit 6a5c912
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions dist/clouduploader.rb
Expand Up @@ -8,7 +8,7 @@
start = Time.now
THIRTY_MINUTES = 1800
HOME = '/etc/obs/cloudupload'.freeze
ENV['HOME'] = HOME
ENV['HOME'] = "/etc/obs/cloudupload"
ENV['PYTHONUNBUFFERED'] = '1'
STDOUT.sync = true

Expand Down Expand Up @@ -38,7 +38,7 @@ def get_ec2_credentials(data)
]

# Credentials are stored in ~/.aws/credentials
out, err, status = Open3.capture3(command)
out, err, status = Open3.capture3(*command)

if status.success?
STDOUT.write("Successfully authenticated.\n")
Expand Down Expand Up @@ -74,7 +74,7 @@ def upload_image_to_ec2(image, data, jobid)
end
command << image

Open3.popen2e(command) do |_stdin, stdout_stderr, _wait_thr|
Open3.popen2e(*command) do |_stdin, stdout_stderr, wait_thr|
Signal.trap("TERM") {
# We just omit the SIGTERM because otherwise we would not get logs from ec2uploadimg
STDOUT.write("Received abort signal, waiting for ec2uploadimg to properly clean up.\n")
Expand Down

0 comments on commit 6a5c912

Please sign in to comment.