Skip to content

Commit 365f6b4

Browse files
author
JemyCheung
committed
resumeUp[ci skip]
1 parent daf7fb6 commit 365f6b4

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

library/src/main/java/com/qiniu/android/storage/ResumeUploader.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,9 @@ private void makeBlock(String upHost, long offset, int blockSize, int chunkSize,
142142
LogHandler logHandler = UploadInfoElementCollector.getUplogHandler(UploadInfo.getReqInfo());
143143
logHandler.send("target_key", key);
144144
logHandler.send("up_type", "mkblk");
145-
if (recover_from > 0)
146-
logHandler.send("recovered_from", recover_from);
145+
logHandler.send("tid", (long) android.os.Process.myTid());
146+
logHandler.send("file_offset", offset);
147+
logHandler.send("bytes_total", chunkSize);
147148
String path = format(Locale.ENGLISH, "/mkblk/%d", blockSize);
148149
try {
149150
file.seek(offset);
@@ -162,6 +163,9 @@ private void putChunk(String upHost, long offset, int chunkSize, String context,
162163
LogHandler logHandler = UploadInfoElementCollector.getUplogHandler(UploadInfo.getReqInfo());
163164
logHandler.send("target_key", key);
164165
logHandler.send("up_type", "bput");
166+
logHandler.send("tid", (long) android.os.Process.myTid());
167+
logHandler.send("file_offset", offset);
168+
logHandler.send("bytes_total", chunkSize);
165169
int chunkOffset = (int) (offset % Configuration.BLOCK_SIZE);
166170
String path = format(Locale.ENGLISH, "/bput/%s/%d", context, chunkOffset);
167171
try {
@@ -172,7 +176,6 @@ private void putChunk(String upHost, long offset, int chunkSize, String context,
172176
return;
173177
}
174178
this.crc32 = Crc32.bytes(chunkBuffer, 0, chunkSize);
175-
176179
String postUrl = String.format("%s%s", upHost, path);
177180
post(logHandler, postUrl, chunkBuffer, 0, chunkSize, progress, _completionHandler, c);
178181
}
@@ -181,6 +184,8 @@ private void makeFile(String upHost, CompletionHandler _completionHandler, UpCan
181184
LogHandler logHandler = UploadInfoElementCollector.getUplogHandler(UploadInfo.getReqInfo());
182185
logHandler.send("target_key", key);
183186
logHandler.send("up_type", "mkfile");
187+
logHandler.send("tid", (long) android.os.Process.myTid());
188+
184189
String mime = format(Locale.ENGLISH, "/mimeType/%s/fname/%s",
185190
UrlSafeBase64.encodeToString(options.mimeType), UrlSafeBase64.encodeToString(f.getName()));
186191

@@ -203,6 +208,8 @@ private void makeFile(String upHost, CompletionHandler _completionHandler, UpCan
203208
String bodyStr = StringUtils.join(contexts, ",");
204209
byte[] data = bodyStr.getBytes();
205210
String postUrl = String.format("%s%s", upHost, path);
211+
logHandler.send("file_offset", 0);
212+
logHandler.send("bytes_total", data.length);
206213
post(logHandler, postUrl, data, 0, data.length, null, _completionHandler, c);
207214
}
208215

library/src/main/java/com/qiniu/android/storage/ResumeUploaderFast.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ private void makeFile(String upHost, CompletionHandler _completionHandler, UpCan
320320
String bodyStr = StringUtils.join(contexts, ",");
321321
byte[] data = bodyStr.getBytes();
322322
String postUrl = String.format("%s%s", upHost, path);
323+
logHandler.send("bytes_total", data.length);
323324
post(logHandler, postUrl, data, 0, data.length, null, _completionHandler, c);
324325
}
325326

0 commit comments

Comments
 (0)