multi-tasks 1.0.6 → 1.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +0 -2
- package/package.json +22 -23
- package/workers/SuperProducer.js +14 -2
- package/workers/master.js +12 -3
package/README.md
CHANGED
package/package.json
CHANGED
|
@@ -1,23 +1,22 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "multi-tasks",
|
|
3
|
-
"version": "1.0.
|
|
4
|
-
"description": "",
|
|
5
|
-
"main": "index.js",
|
|
6
|
-
"directories": {
|
|
7
|
-
"example": "example"
|
|
8
|
-
},
|
|
9
|
-
"scripts": {
|
|
10
|
-
"test": "echo \"Error: no test specified\" && exit 1"
|
|
11
|
-
},
|
|
12
|
-
"keywords": [
|
|
13
|
-
"multitask",
|
|
14
|
-
"worker",
|
|
15
|
-
"multithread"
|
|
16
|
-
],
|
|
17
|
-
"dependencies": {
|
|
18
|
-
"
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
"
|
|
22
|
-
|
|
23
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "multi-tasks",
|
|
3
|
+
"version": "1.0.7",
|
|
4
|
+
"description": "",
|
|
5
|
+
"main": "index.js",
|
|
6
|
+
"directories": {
|
|
7
|
+
"example": "example"
|
|
8
|
+
},
|
|
9
|
+
"scripts": {
|
|
10
|
+
"test": "echo \"Error: no test specified\" && exit 1"
|
|
11
|
+
},
|
|
12
|
+
"keywords": [
|
|
13
|
+
"multitask",
|
|
14
|
+
"worker",
|
|
15
|
+
"multithread"
|
|
16
|
+
],
|
|
17
|
+
"dependencies": {
|
|
18
|
+
"make-dir":"^3.1.0"
|
|
19
|
+
},
|
|
20
|
+
"author": "zhanglei923@gmail.com",
|
|
21
|
+
"license": "MIT"
|
|
22
|
+
}
|
package/workers/SuperProducer.js
CHANGED
|
@@ -1,8 +1,20 @@
|
|
|
1
1
|
let fs = require('fs');
|
|
2
|
-
let moment = require('moment');
|
|
3
2
|
let pathutil = require('path');
|
|
4
3
|
let makeDir = require('make-dir');
|
|
5
4
|
let splitter = require('./taskSplitter');
|
|
5
|
+
let fmtdigit = (n)=>{
|
|
6
|
+
return n > 9 ? "" + n: "0" + n;
|
|
7
|
+
}
|
|
8
|
+
let getDateTimeTxt = ()=>{
|
|
9
|
+
let d=new Date();
|
|
10
|
+
let YYYY=d.getFullYear()
|
|
11
|
+
let MM=fmtdigit(d.getMonth()+1);
|
|
12
|
+
let DD=fmtdigit(d.getDate());
|
|
13
|
+
let HH=fmtdigit(d.getHours());
|
|
14
|
+
let mm=fmtdigit(d.getMinutes());
|
|
15
|
+
let ss=fmtdigit(d.getSeconds());
|
|
16
|
+
return `${YYYY}-${MM}-${DD}_${HH}-${mm}-${ss}`;
|
|
17
|
+
};
|
|
6
18
|
class SuperProducer {
|
|
7
19
|
// constructor
|
|
8
20
|
constructor(taskname, parentfolder) {
|
|
@@ -20,7 +32,7 @@ class SuperProducer {
|
|
|
20
32
|
}
|
|
21
33
|
generateTasks (quota, callback){
|
|
22
34
|
if(typeof quota === 'undefined' || !quota)quota=10;
|
|
23
|
-
let dateTimeText = moment().format('YYYY-MM-DD_HH-mm-ss');
|
|
35
|
+
let dateTimeText = getDateTimeTxt();//moment().format('YYYY-MM-DD_HH-mm-ss');
|
|
24
36
|
let masterTaskId = `${this.taskname}_${dateTimeText}`;
|
|
25
37
|
console.log('masterTaskId=',masterTaskId);
|
|
26
38
|
this.taskfolder = pathutil.resolve(this.parentfolder, masterTaskId)
|
package/workers/master.js
CHANGED
|
@@ -2,7 +2,6 @@ var fs = require('fs');
|
|
|
2
2
|
var pathutil = require('path');
|
|
3
3
|
const cluster = require('cluster');
|
|
4
4
|
const numCPUs = require('os').cpus().length;
|
|
5
|
-
let moment = require('moment');
|
|
6
5
|
|
|
7
6
|
|
|
8
7
|
let MSG_REQUEST_TASKID = 'request_taskid';
|
|
@@ -12,9 +11,19 @@ let MSG_REQUEST_TASKID = 'request_taskid';
|
|
|
12
11
|
* -masterTaskId, id of a master, will rename to masterId
|
|
13
12
|
* -task, a child computing process
|
|
14
13
|
*/
|
|
15
|
-
|
|
14
|
+
let fmtdigit = (n)=>{
|
|
15
|
+
return n > 9 ? "" + n: "0" + n;
|
|
16
|
+
}
|
|
16
17
|
let getDateTimeTxt = ()=>{
|
|
17
|
-
|
|
18
|
+
let d=new Date();
|
|
19
|
+
let YYYY=d.getFullYear()
|
|
20
|
+
let MM=fmtdigit(d.getMonth()+1);
|
|
21
|
+
let DD=fmtdigit(d.getDate());
|
|
22
|
+
let HH=fmtdigit(d.getHours());
|
|
23
|
+
let mm=fmtdigit(d.getMinutes());
|
|
24
|
+
let ss=fmtdigit(d.getSeconds());
|
|
25
|
+
//return moment().format('YYYY-MM-DD HH:mm:ss');
|
|
26
|
+
return `${YYYY}-${MM}-${DD} ${HH}:${mm}:${ss}`;
|
|
18
27
|
};
|
|
19
28
|
let workidlist = new Set();
|
|
20
29
|
let addWorker = (wid)=>{
|