Удалил неиспользуемый код
This commit is contained in:
@@ -25,60 +25,7 @@ class WorkerController extends BaseController {
|
|||||||
res.status(400).send({error});
|
res.status(400).send({error});
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO: удалить бесполезную getStateFinish
|
|
||||||
async getStateFinish(req, res) {
|
|
||||||
const request = req.body;
|
|
||||||
let error = '';
|
|
||||||
try {
|
|
||||||
if (!request.workerId)
|
|
||||||
throw new Error(`key 'workerId' is wrong`);
|
|
||||||
|
|
||||||
res.writeHead(200, {
|
|
||||||
'Content-Type': 'text/json; charset=utf-8',
|
|
||||||
});
|
|
||||||
|
|
||||||
const splitter = '-- aod2t5hDXU32bUFyqlFE next status --';
|
|
||||||
const refreshPause = 200;
|
|
||||||
let i = 0;
|
|
||||||
let prevProgress = -1;
|
|
||||||
let prevState = '';
|
|
||||||
let state;
|
|
||||||
while (1) {// eslint-disable-line no-constant-condition
|
|
||||||
state = this.workerState.getState(request.workerId);
|
|
||||||
if (!state) break;
|
|
||||||
|
|
||||||
res.write(splitter + JSON.stringify(state));
|
|
||||||
res.flush();
|
|
||||||
|
|
||||||
if (state.state != 'finish' && state.state != 'error')
|
|
||||||
await utils.sleep(refreshPause);
|
|
||||||
else
|
|
||||||
break;
|
|
||||||
|
|
||||||
i++;
|
|
||||||
if (i > 2*60*1000/refreshPause) {//2 мин ждем телодвижений воркера
|
|
||||||
res.write(splitter + JSON.stringify({state: 'error', error: 'Слишком долгое время ожидания'}));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
i = (prevProgress != state.progress || prevState != state.state ? 1 : i);
|
|
||||||
prevProgress = state.progress;
|
|
||||||
prevState = state.state;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!state) {
|
|
||||||
res.write(splitter + JSON.stringify({}));
|
|
||||||
}
|
|
||||||
|
|
||||||
res.end();
|
|
||||||
return false;
|
|
||||||
} catch (e) {
|
|
||||||
error = e.message;
|
|
||||||
}
|
|
||||||
//bad request
|
|
||||||
res.status(400).send({error});
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = WorkerController;
|
module.exports = WorkerController;
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ function initRoutes(app, wss, config) {
|
|||||||
['POST', '/api/reader/upload-file', [upload.single('file'), reader.uploadFile.bind(reader)], [aAll], {}],
|
['POST', '/api/reader/upload-file', [upload.single('file'), reader.uploadFile.bind(reader)], [aAll], {}],
|
||||||
['POST', '/api/reader/restore-cached-file', reader.restoreCachedFile.bind(reader), [aAll], {}],
|
['POST', '/api/reader/restore-cached-file', reader.restoreCachedFile.bind(reader), [aAll], {}],
|
||||||
['POST', '/api/worker/get-state', worker.getState.bind(worker), [aAll], {}],
|
['POST', '/api/worker/get-state', worker.getState.bind(worker), [aAll], {}],
|
||||||
['POST', '/api/worker/get-state-finish', worker.getStateFinish.bind(worker), [aAll], {}],
|
|
||||||
];
|
];
|
||||||
|
|
||||||
//to app
|
//to app
|
||||||
|
|||||||
Reference in New Issue
Block a user