Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-23 18:55:26 +00:00
Code Issues Projects Releases Wiki Activity

feature(main) sendResponse: params, data, notLog -> data, params, notLog

Browse source
This commit is contained in:
coderaiser 2014-08-13 09:13:25 -04:00
parent 391db5f83f
commit 73fa821b37
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cloudcmd.js
View file

@ -257,7 +257,7 @@
if (error)
main.sendError(error, p);
else
main.sendResponse(p, data, NOT_LOG);
main.sendResponse(data, p, NOT_LOG);
});
});
}

13
lib/server/main.js
View file

@ -303,13 +303,13 @@
* @param Data - данные
* @param pName - имя отсылаемого файла
*/
function sendResponse(params, data, notLog) {
function sendResponse(data, params, notLog) {
var p, isGzip, head,
ret = checkParams(params);
if (ret) {
p = params;
data = p.data || data;
data = data;
isGzip = p.gzip && isGZIP(p.request);
head = generateHeaders({
@ -377,14 +377,13 @@
* send error response
*/
function sendError(error, params) {
var p, ret = checkParams(params);
var data, ret = checkParams(params);
if (ret) {
p = params;
p.status = FILE_NOT_FOUND;
p.data = error.message || '' + error;
params.status = FILE_NOT_FOUND;
data = error.message || '' + error;
sendResponse(p);
sendResponse(data, params);
}
}

2
lib/server/rest.js
View file

@ -76,7 +76,7 @@
if (error)
main.sendError(error, params);
else
main.sendResponse(params, data, options.notLog);
main.sendResponse(data, params, options.notLog);
});
}
}