Skip to content

修复日志统计bug #242

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

Merged
merged 3 commits into from
Jul 12, 2017
Merged

修复日志统计bug #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
860568f
fix regexp for reqid
alexmaze Jul 12, 2017
102847c
fix time compute
alexmaze Jul 12, 2017
a581c74
add new dist
alexmaze Jul 12, 2017
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
18 changes: 10 additions & 8 deletions dist/qiniu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* GitHub: http://github.com/qiniu/js-sdk
*
* Date: 2017-7-5
* Date: 2017-7-12
*/

/*global plupload ,moxie*/
Expand Down Expand Up @@ -1352,17 +1352,18 @@

// add send log for upload error
if (!op.disable_statistics_report) {
var matchedGroups = (err && err.responseHeaders && err.responseHeaders.match) ? err.responseHeaders.match(/(X-Reqid\:\ )(\w*)/) : [];
var matchedGroups = (err && err.responseHeaders && err.responseHeaders.match) ? err.responseHeaders.match(/(X-Reqid\:\ )([\w\.\%-]*)/) : [];
var req_id = matchedGroups[2];
var errcode = plupload.HTTP_ERROR ? err.status : err.code;
var startAt = file._start_at ? file._start_at.getTime() : nowTime.getTime();
statisticsLogger.log(
errcode === 0 ? ExtraErrors.NetworkError : errcode,
req_id,
getDomainFromUrl(up.settings.url),
undefined,
getPortFromUrl(up.settings.url),
nowTime.getTime() - file._start_at.getTime(),
file._start_at.getTime(),
nowTime.getTime() - startAt,
startAt,
err.file.size * (err.file.percent / 100),
"jssdk-" + up.runtime,
file.size
Expand Down Expand Up @@ -1509,15 +1510,16 @@

// send statistics log
if (!op.disable_statistics_report) {
var req_id = info.responseHeaders.match(/(X-Reqid\:\ )(\w*)/)[2];
var req_id = info.responseHeaders.match(/(X-Reqid\:\ )([\w\.\%-]*)/)[2];
var startAt = file._start_at ? file._start_at.getTime() : nowTime.getTime();
statisticsLogger.log(
info.status,
req_id,
getDomainFromUrl(up.settings.url),
undefined,
getPortFromUrl(up.settings.url),
nowTime.getTime() - file._start_at.getTime(),
file._start_at.getTime(),
nowTime.getTime() - startAt,
startAt,
file.size,
"jssdk-" + up.runtime,
file.size
Expand All @@ -1544,7 +1546,7 @@
getPortFromUrl(up.settings.url),
nowTime.getTime() - files[i]._start_at.getTime(),
files[i]._start_at.getTime(),
files[i].size,
files[i].size * files[i].percent / 100,
"jssdk-" + up.runtime,
files[i].size
);
Expand Down
Loading