Merge lp:~facundo/ubuntuone-client/fix-progress-events into lp:ubuntuone-client

Proposed by Facundo Batista on 2012-09-14
Status: Merged
Approved by: Facundo Batista on 2012-09-17
Approved revision: 1310
Merged at revision: 1310
Proposed branch: lp:~facundo/ubuntuone-client/fix-progress-events
Merge into: lp:ubuntuone-client
Diff against target: 34 lines (+3/-3)
2 files modified
ubuntuone/syncdaemon/action_queue.py (+1/-1)
ubuntuone/syncdaemon/interaction_interfaces.py (+2/-2)
To merge this branch: bzr merge lp:~facundo/ubuntuone-client/fix-progress-events
Reviewer Review Type Date Requested Status
Natalia Bidart Approve on 2012-09-17
Manuel de la Peña (community) 2012-09-14 Approve on 2012-09-17
Review via email: mp+124537@code.launchpad.net

Commit message

Put the "progress threshold" in 64K and log it in interaction interfaces only in TRACE (LP: #675065).

Description of the change

Put the "progress threshold" in 64K and log it in interaction interfaces only in TRACE.

To post a comment you must log in.
review: Approve
Natalia Bidart (nataliabidart) wrote :

Looks great!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/syncdaemon/action_queue.py'
2--- ubuntuone/syncdaemon/action_queue.py 2012-06-14 13:47:02 +0000
3+++ ubuntuone/syncdaemon/action_queue.py 2012-09-14 23:36:19 +0000
4@@ -79,7 +79,7 @@
5 EREGEX = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$"
6
7 # progress threshold to emit a download/upload progress event: 64Kb
8-TRANSFER_PROGRESS_THRESHOLD = 64 * 1024 * 1024
9+TRANSFER_PROGRESS_THRESHOLD = 64 * 1024
10
11
12 class DeferredInterrupted(Exception):
13
14=== modified file 'ubuntuone/syncdaemon/interaction_interfaces.py'
15--- ubuntuone/syncdaemon/interaction_interfaces.py 2012-08-13 20:06:05 +0000
16+++ ubuntuone/syncdaemon/interaction_interfaces.py 2012-09-14 23:36:19 +0000
17@@ -811,7 +811,7 @@
18 """Handle AQ_DOWNLOAD_STARTED."""
19 self._path_from_ids(share_id, node_id, 'DownloadStarted')
20
21- @log_call(logger.debug)
22+ @log_call(logger.trace)
23 def handle_AQ_DOWNLOAD_FILE_PROGRESS(self, share_id, node_id,
24 n_bytes_read, deflated_size):
25 """Handle AQ_DOWNLOAD_FILE_PROGRESS."""
26@@ -836,7 +836,7 @@
27 """Handle AQ_UPLOAD_STARTED."""
28 self._path_from_ids(share_id, node_id, 'UploadStarted')
29
30- @log_call(logger.debug)
31+ @log_call(logger.trace)
32 def handle_AQ_UPLOAD_FILE_PROGRESS(self, share_id, node_id,
33 n_bytes_written, deflated_size):
34 """Handle AQ_UPLOAD_FILE_PROGRESS."""

Subscribers

People subscribed via source and target branches