kopia lustrzana https://github.com/OpenDroneMap/NodeODM
Cleanup, syntax error fix, added /getInfo
rodzic
734a4d31f6
commit
e1e7fa8fbf
30
index.js
30
index.js
|
@ -17,10 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/
|
||||
"use strict";
|
||||
|
||||
let fs = require('fs');
|
||||
let config = require('./config.js');
|
||||
let packageJson = JSON.parse(fs.readFileSync('./package.json'));
|
||||
|
||||
let logger = require('./libs/logger');
|
||||
let fs = require('fs');
|
||||
let path = require('path');
|
||||
let async = require('async');
|
||||
|
||||
|
@ -359,7 +360,7 @@ let successHandler = res => {
|
|||
* $ref: "#/definitions/Response"
|
||||
*/
|
||||
app.post('/task/cancel', uuidCheck, (req, res) => {
|
||||
taskManager.cancel(req.body.uuid, e(res));
|
||||
taskManager.cancel(req.body.uuid, successHandler(res));
|
||||
});
|
||||
|
||||
/** @swagger
|
||||
|
@ -448,6 +449,31 @@ app.get('/getOptions', (req, res) => {
|
|||
});
|
||||
});
|
||||
|
||||
/** @swagger
|
||||
* /getInfo:
|
||||
* get:
|
||||
* description: Retrieves information about this node.
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Info
|
||||
* schema:
|
||||
* type: object
|
||||
* required: [version, taskQueueCount]
|
||||
* properties:
|
||||
* version:
|
||||
* type: string
|
||||
* description: Current version
|
||||
* taskQueueCount:
|
||||
* type: integer
|
||||
* description: Number of tasks currently being processed or waiting to be processed
|
||||
*/
|
||||
app.get('/getInfo', (req, res) => {
|
||||
res.json({
|
||||
version: packageJson.version,
|
||||
currentTaskQueue: taskManager.getQueueCount()
|
||||
});
|
||||
});
|
||||
|
||||
let gracefulShutdown = done => {
|
||||
async.series([
|
||||
cb => taskManager.dumpTaskList(cb),
|
||||
|
|
|
@ -241,4 +241,17 @@ module.exports = class TaskManager{
|
|||
if (done !== undefined) done();
|
||||
});
|
||||
}
|
||||
|
||||
getQueueCount(){
|
||||
let count = 0;
|
||||
for (let uuid in this.tasks){
|
||||
let task = this.tasks[uuid];
|
||||
|
||||
if ([statusCodes.QUEUED,
|
||||
statusCodes.RUNNING].indexOf(task.status.code) !== -1){
|
||||
count++;
|
||||
}
|
||||
}
|
||||
return count;
|
||||
}
|
||||
};
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
"use strict";
|
||||
module.exports = {
|
||||
get: function(scope, prop, defaultValue){
|
||||
let parts = prop.split(".");
|
||||
|
|
Ładowanie…
Reference in New Issue