Skip to content

Use stderr for stats output, #678 #864

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

Open
mattpker wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −5
Open

Use stderr for stats output, #678 #864

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
14 changes: 9 additions & 5 deletions s3cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ def output(message):
sys.stdout.write(message + "\n")
sys.stdout.flush()

def output_stderr(message):
sys.stderr.write(message + "\n")
sys.stderr.flush()

def check_args_type(args, type, verbose_type):
"""NOTE: This function looks like to not be used."""
for arg in args:
Expand Down Expand Up @@ -653,7 +657,7 @@ def subcmd_batch_del_iterative(uri_str = None, bucket = None):
stats_info = StatsInfo()
stats_info.files_deleted = deleted_count
stats_info.size_deleted = deleted_bytes
output(stats_info.format_output())
output_stderr(stats_info.format_output())
else:
total_size, size_coeff = formatSize(deleted_bytes, Config().human_readable_sizes)
total_size_str = str(total_size) + size_coeff
Expand Down Expand Up @@ -1108,7 +1112,7 @@ def cmd_sync_remote2remote(args):
outstr = "Done. Copied %d files in %0.1f seconds, %0.2f files/s." % (total_files_copied, total_elapsed, seq / total_elapsed)
if cfg.stats:
outstr += stats_info.format_output()
output(outstr)
output_stderr(outstr)
elif seq > 0:
output(outstr)
else:
Expand Down Expand Up @@ -1467,7 +1471,7 @@ def cmd_sync_remote2local(args):
outstr = "Done. Downloaded %d bytes in %0.1f seconds, %0.2f %sB/s." % (size_transferred, total_elapsed, speed_fmt[0], speed_fmt[1])
if cfg.stats:
outstr += stats_info.format_output()
output(outstr)
output_stderr(outstr)
elif size_transferred > 0:
output(outstr)
else:
Expand Down Expand Up @@ -1765,7 +1769,7 @@ def cmd_sync_local2remote(args):
outstr = "Done. Uploaded %d bytes in %0.1f seconds, %0.2f %sB/s." % (size_transferred, total_elapsed, speed_fmt[0], speed_fmt[1])
if cfg.stats:
outstr += stats_info.format_output()
output(outstr)
output_stderr(outstr)
elif size_transferred + saved_bytes > 0:
output(outstr)
else:
Expand Down Expand Up @@ -2647,7 +2651,7 @@ def main():

optparser.add_option( "--progress", dest="progress_meter", action="store_true", help="Display progress meter (default on TTY).")
optparser.add_option( "--no-progress", dest="progress_meter", action="store_false", help="Don't display progress meter (default on non-TTY).")
optparser.add_option( "--stats", dest="stats", action="store_true", help="Give some file-transfer stats.")
optparser.add_option( "--stats", dest="stats", action="store_true", help="Give some file-transfer stats. These stats are sent to stderr for logging purposes.")
optparser.add_option( "--enable", dest="enable", action="store_true", help="Enable given CloudFront distribution (only for [cfmodify] command)")
optparser.add_option( "--disable", dest="enable", action="store_false", help="Disable given CloudFront distribution (only for [cfmodify] command)")
optparser.add_option( "--cf-invalidate", dest="invalidate_on_cf", action="store_true", help="Invalidate the uploaded filed in CloudFront. Also see [cfinval] command.")
Expand Down