|
184 | 184 | waiting: 0,
|
185 | 185 | processing: 1,
|
186 | 186 | finished: 2
|
187 |
| - } |
| 187 | + }; |
188 | 188 |
|
189 | 189 | /**
|
190 | 190 | * send logs to statistics server
|
|
207 | 207 | status: TaskStatus.waiting
|
208 | 208 | });
|
209 | 209 | logger.debug("[STATISTICS] send log to statistics server", log);
|
210 |
| - } |
| 210 | + }; |
211 | 211 |
|
212 | 212 | function tick() {
|
213 | 213 | var unFinishedTasks = [];
|
|
258 | 258 | UnknownHost: -1003,
|
259 | 259 | CannotConnectToHost: -1004,
|
260 | 260 | NetworkConnectionLost: -1005
|
261 |
| - } |
| 261 | + }; |
262 | 262 |
|
263 | 263 | /**
|
264 | 264 | * reset upload url
|
|
607 | 607 | }
|
608 | 608 | return '{' + string.join(',') + '}';
|
609 | 609 | }
|
| 610 | + break; |
610 | 611 | case 'number':
|
611 | 612 | return obj;
|
612 | 613 | case false:
|
|
859 | 860 | return groups ? groups[1] : "";
|
860 | 861 | }
|
861 | 862 | return "";
|
862 |
| - } |
| 863 | + }; |
863 | 864 |
|
864 | 865 | var getPortFromUrl = function (url) {
|
865 | 866 | if (url && url.match) {
|
866 |
| - var groups = url.match(/(^https?)/) |
| 867 | + var groups = url.match(/(^https?)/); |
867 | 868 | if (!groups) {
|
868 | 869 | return "";
|
869 | 870 | }
|
870 | 871 | var type = groups[1];
|
871 | 872 | groups = url.match(/^https?:\/\/([^:^/]*):(\d*)/);
|
872 | 873 | if (groups) {
|
873 | 874 | return groups[2];
|
874 |
| - } else if (type == "http") { |
| 875 | + } else if (type === "http") { |
875 | 876 | return "80";
|
876 | 877 | } else {
|
877 | 878 | return "443";
|
878 | 879 | }
|
879 | 880 | }
|
880 | 881 | return "";
|
881 |
| - } |
| 882 | + }; |
882 | 883 |
|
883 | 884 | /********** inner function define end **********/
|
884 | 885 |
|
|
1253 | 1254 | return function (up, err) {
|
1254 | 1255 | logger.error("Error event activated");
|
1255 | 1256 | logger.error("err: ", err);
|
| 1257 | + var nowTime = new Date(); |
1256 | 1258 | var errTip = '';
|
1257 | 1259 | var file = err.file;
|
1258 | 1260 | if (file) {
|
|
1354 | 1356 | var req_id = matchedGroups[2];
|
1355 | 1357 | var errcode = plupload.HTTP_ERROR ? err.status : err.code;
|
1356 | 1358 | statisticsLogger.log(
|
1357 |
| - errcode == 0 ? ExtraErrors.NetworkError : errcode, |
| 1359 | + errcode === 0 ? ExtraErrors.NetworkError : errcode, |
1358 | 1360 | req_id,
|
1359 | 1361 | getDomainFromUrl(up.settings.url),
|
1360 | 1362 | undefined,
|
1361 | 1363 | getPortFromUrl(up.settings.url),
|
1362 |
| - (new Date()).getTime() - file._start_at.getTime(), |
| 1364 | + nowTime.getTime() - file._start_at.getTime(), |
1363 | 1365 | file._start_at.getTime(),
|
1364 | 1366 | err.file.size * (err.file.percent / 100),
|
1365 | 1367 | "jssdk-" + up.runtime,
|
|
1380 | 1382 | logger.debug("FileUploaded event activated");
|
1381 | 1383 | logger.debug("FileUploaded file: ", file);
|
1382 | 1384 | logger.debug("FileUploaded info: ", info);
|
| 1385 | + var nowTime = new Date(); |
1383 | 1386 | var last_step = function (up, file, info) {
|
1384 | 1387 | logger.debug("FileUploaded last step:", info);
|
1385 | 1388 | if (op.downtoken_url) {
|
|
1513 | 1516 | getDomainFromUrl(up.settings.url),
|
1514 | 1517 | undefined,
|
1515 | 1518 | getPortFromUrl(up.settings.url),
|
1516 |
| - (new Date()).getTime() - file._start_at.getTime(), |
| 1519 | + nowTime.getTime() - file._start_at.getTime(), |
1517 | 1520 | file._start_at.getTime(),
|
1518 | 1521 | file.size,
|
1519 | 1522 | "jssdk-" + up.runtime,
|
|
1529 | 1532 | // intercept the cancel of upload
|
1530 | 1533 | // used to send statistics log to server
|
1531 | 1534 | uploader.bind('FilesRemoved', function (up, files) {
|
| 1535 | + var nowTime = new Date(); |
1532 | 1536 | // add cancel log
|
1533 | 1537 | if (!op.disable_statistics_report) {
|
1534 | 1538 | for (var i = 0; i < files.length; i++) {
|
|
1538 | 1542 | getDomainFromUrl(up.settings.url),
|
1539 | 1543 | undefined,
|
1540 | 1544 | getPortFromUrl(up.settings.url),
|
1541 |
| - (new Date()).getTime() - files[i]._start_at.getTime(), |
| 1545 | + nowTime.getTime() - files[i]._start_at.getTime(), |
1542 | 1546 | files[i]._start_at.getTime(),
|
1543 | 1547 | files[i].size,
|
1544 | 1548 | "jssdk-" + up.runtime,
|
1545 | 1549 | files[i].size
|
1546 | 1550 | );
|
1547 | 1551 | }
|
1548 | 1552 | }
|
1549 |
| - }) |
| 1553 | + }); |
1550 | 1554 |
|
1551 | 1555 | logger.debug("bind FilesRemoved event");
|
1552 | 1556 |
|
|
0 commit comments