Skip to content

Commit 913276a

Browse files
ar2rsawseenar2rsawseen
committed
[eslint] Moar fixes
1 parent 9ea093d commit 913276a

25 files changed

+766
-270
lines changed

‎Gruntfile.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ module.exports = function(grunt) {
4040
nodejs: {
4141
options: {
4242
configFile: 'bin/config/eslint/eslint_nodejs.json',
43-
ignorePattern: ["plugins/push/api/parts/apn"]
43+
ignorePattern: ["plugins/push/api/parts/apn"],
44+
fix: true
4445
},
4546
src: [
4647
'api/**/*.js',

‎api/configextender.js

+29-17
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,20 @@ var parser = function(val) {
44
parsedVal = JSON.parse(val);
55
if (typeof val === typeof parsedVal) {
66
val = parsedVal;
7-
} else if (val === parsedVal.toString()) {
7+
}
8+
else if (val === parsedVal.toString()) {
89
val = parsedVal;
9-
} else if (Array.isArray(parsedVal)) {
10+
}
11+
else if (Array.isArray(parsedVal)) {
1012
val = parsedVal;
11-
} else if (typeof parsedVal === 'object') {
13+
}
14+
else if (typeof parsedVal === 'object') {
1215
val = parsedVal;
1316
}
14-
} catch (error) {}
17+
}
18+
catch (error) {
19+
//ignored error
20+
}
1521
return val;
1622
};
1723

@@ -47,7 +53,7 @@ const OVERRIDES = {
4753
* @param {[type]} value [description]
4854
* @return {[type]} [description]
4955
*/
50-
function dig (config, over, name, value) {
56+
function dig(config, over, name, value) {
5157
let comps = name.split('_');
5258

5359
for (let i = comps.length; i > 0; i--) {
@@ -59,7 +65,8 @@ function dig (config, over, name, value) {
5965
if (typeof over[n] === 'string') {
6066
sub = over[n];
6167
over[n] = {};
62-
} else {
68+
}
69+
else {
6370
sub = Object.keys(config).filter(k => k.toUpperCase() === n)[0];
6471
}
6572

@@ -72,14 +79,17 @@ function dig (config, over, name, value) {
7279

7380
if (typeof config[sub] === 'object') {
7481
return dig(config[sub], over[n], name, value);
75-
} else if (sub) {
82+
}
83+
else if (sub) {
7684
config[sub] = {};
7785
return dig(config[sub], over[n], name, value);
78-
} else {
86+
}
87+
else {
7988
config[n] = {};
8089
return dig(config[n], over[n], name, value);
8190
}
82-
} else if (n === over) {
91+
}
92+
else if (n === over) {
8393
name = over;
8494
config[name] = value;
8595
return true;
@@ -89,38 +99,40 @@ function dig (config, over, name, value) {
8999
for (let i = 1; i <= comps.length; i++) {
90100
let n = comps.slice(0, i).join('_'),
91101
sub = Object.keys(config).filter(k => k.toUpperCase() === n)[0],
92-
name = comps.slice(i).join('_');
93-
102+
name2 = comps.slice(i).join('_');
103+
94104
if (sub) {
95105
if (comps.length === 1) {
96106
config[sub] = value;
97107
return true;
98-
} else {
108+
}
109+
else {
99110
config[sub] = typeof config[sub] === 'object' ? config[sub] : {};
100-
return dig(config[sub], {}, name, value);
111+
return dig(config[sub], {}, name2, value);
101112
}
102113
}
103114
}
104115

105116
comps.forEach((c, i) => {
106117
if (i === comps.length - 1) {
107118
config[c.toLowerCase()] = value;
108-
} else {
119+
}
120+
else {
109121
config = config[c.toLowerCase()] = {};
110122
}
111-
})
123+
});
112124

113125
return true;
114126
}
115127

116-
module.exports = function (mode, config, opts) {
128+
module.exports = function(mode, config, opts) {
117129
// back compatibility
118130
if (typeof mode === 'object') {
119131
config = mode;
120132
mode = 'API';
121133
opts = process.env;
122134
}
123-
135+
124136
if (['API', 'FRONTEND'].indexOf(mode) === -1) {
125137
throw new Error('Invalid config mode ' + mode);
126138
}

‎api/jobs/clear.js

+6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
const job = require('../parts/jobs/job.js'),
44
log = require('../utils/log.js')('job:clear');
55

6+
/** Class for job of clearing old jobs **/
67
class ClearJob extends job.Job {
8+
/**
9+
* Run the job
10+
* @param {Db} db connection
11+
* @param {done} done callback
12+
*/
713
run(db, done) {
814
log.d('Clearing jobs ...');
915
var query = {

‎api/jobs/clearTokens.js

+6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
const job = require('../parts/jobs/job.js'),
44
authorize = require('../utils/authorizer.js');
55

6+
/** Class for job of clearing tokens **/
67
class CleanTokensJob extends job.Job {
8+
/**
9+
* Run the job
10+
* @param {Db} db connection
11+
* @param {done} done callback
12+
*/
713
run(db, done) {
814
authorize.clean({
915
db: db,

‎api/jobs/ipcTest.js

+31-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
'use strict';
22

33
const job = require('../parts/jobs/job.js'),
4-
res = require('../parts/jobs/resource.js'),
5-
log = require('../utils/log.js')('job:ipcTest');
6-
4+
res = require('../parts/jobs/resource.js'),
5+
log = require('../utils/log.js')('job:ipcTest');
76

7+
/** Class for testing resource handling for jobs **/
88
class TestResource extends res.Resource {
9+
/**
10+
* Open resource
11+
* @returns {Promise} promise
12+
**/
913
open() {
1014
this.a = 0;
1115
return new Promise((resolve) => {
@@ -17,6 +21,10 @@ class TestResource extends res.Resource {
1721
});
1822
}
1923

24+
/**
25+
* Close resource
26+
* @returns {Promise} promise
27+
**/
2028
close() {
2129
return new Promise((resolve) => {
2230
log.d('close');
@@ -27,6 +35,10 @@ class TestResource extends res.Resource {
2735
});
2836
}
2937

38+
/**
39+
* Check if resource is used
40+
* @returns {Promise} promise
41+
**/
3042
checkActive() {
3143
return new Promise((resolve) => {
3244
log.d('checkActive');
@@ -37,14 +49,22 @@ class TestResource extends res.Resource {
3749
}
3850

3951
}
40-
52+
/** Class for testing ipc jobs **/
4153
class Test extends job.IPCJob {
54+
/**
55+
* Create resource
56+
* @returns {Resource} resourse
57+
**/
4258
createResource() {
4359
return new TestResource();
4460
}
4561

62+
/**
63+
* Create between processes
64+
* @returns {Promise} promise
65+
**/
4666
divide() {
47-
return new Promise((resolve, reject) => {
67+
return new Promise((resolve) => {
4868
log.d('dividing ', this._json);
4969

5070
setTimeout(() => {
@@ -59,6 +79,12 @@ class Test extends job.IPCJob {
5979
});
6080
}
6181

82+
/**
83+
* Run the job
84+
* @param {Db} db connection
85+
* @param {done} done callback
86+
* @param {function} progress to report progress of the job
87+
*/
6288
run(db, done, progress) {
6389
log.d('running ', this._json);
6490
log.d('resource is ', typeof this.resource);

‎api/jobs/task.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class MonitorJob extends job.Job {
2626
log.d('Running Task Monitor Job ....');
2727
log.d("job info:", self._json, tasks);
2828
tasks.forEach((task)=>{
29-
return Promise.coroutine(function *() {
29+
return Promise.coroutine(function *() { // eslint-disable-line require-yield
3030
taskmanager.rerunTask({
3131
db: common.db,
3232
id: task._id

‎api/jobs/test.js

+47-2
Original file line numberDiff line numberDiff line change
@@ -7,59 +7,104 @@ const should = require('should'),
77
R = require('../parts/jobs/resource.js'),
88
RET = require('../parts/jobs/retry.js');
99

10-
10+
/** Class for testing resource handling for jobs **/
1111
class TestResource extends R.Resource {
12+
/**
13+
* Open resource
14+
* @returns {Promise} promise
15+
**/
1216
open() {
1317
console.log('resource: opening in %d', process.pid);
1418
this.opened();
1519
this.openedTime = Date.now();
1620
return Promise.resolve();
1721
}
1822

23+
/**
24+
* Close resource
25+
* @returns {Promise} promise
26+
**/
1927
close() {
2028
console.log('resource: closing in %d', process.pid);
2129
this.closed();
2230
return Promise.resolve();
2331
}
2432

33+
/**
34+
* Kill resource
35+
* @returns {Promise} promise
36+
**/
2537
kill() {
2638
console.log('resource: killed in %d', process.pid);
2739
return Promise.resolve();
2840
}
2941

42+
/**
43+
* Check if resource is used
44+
* @returns {Promise} promise
45+
**/
3046
checkActive() {
3147
console.log('resource: checkActive in %d', process.pid);
3248
return Promise.resolve(Date.now() - this.openedTime < 20000);
3349
}
3450

51+
/** Start using resource **/
3552
start() {
3653
this.openedTime = Date.now();
3754
super.start.apply(this, arguments);
3855
}
3956
}
40-
57+
/** Class for testing ipc jobs **/
4158
class IPCTestJob extends J.IPCJob {
59+
/**
60+
* Prepare the job
61+
* @param {object} manager - resource manager
62+
* @param {Db} db - db connection
63+
*/
4264
async prepare(manager, db) {
4365
console.log('preparing in %d', process.pid);
4466
await new Promise((res, rej) => db.collection('jobs').updateOne({_id: this._id}, {$set: {'data.prepared': 1}}, err => err ? rej(err) : res()));
4567
}
4668

69+
/**
70+
* Get resource name
71+
* @returns {string} resource name
72+
**/
4773
resourceName() {
4874
return 'resource:test';
4975
}
5076

77+
/**
78+
* Create resource
79+
* @param {string} _id - resource _id
80+
* @param {string} name - resource name
81+
* @param {Db} db - db connection
82+
* @returns {Resource} resource
83+
*/
5184
createResource(_id, name, db) {
5285
return new TestResource(_id, name, db);
5386
}
5487

88+
/**
89+
* Get retry policy
90+
* @returns {RetryPolicy} retry policy
91+
**/
5592
retryPolicy() {
5693
return new RET.NoRetryPolicy();
5794
}
5895

96+
/**
97+
* Get concurrency
98+
* @returns {number} concurency
99+
**/
59100
getConcurrency() {
60101
return this.data && this.data.concurrency || 0;
61102
}
62103

104+
/**
105+
* Run the job
106+
* @param {Db} db connection
107+
*/
63108
async run(db) {
64109
console.log('running in %d', process.pid);
65110
should.exist(this.resource);

‎api/lib/countly.common.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2160,4 +2160,4 @@ function arrayAddUniq(arr, item) {
21602160
}
21612161
}
21622162

2163-
module.exports = countlyCommon;
2163+
module.exports = countlyCommon;

‎api/parts/jobs/executor.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ process.on('unhandledRejection', (reason, p) => {
1515
* Entry point for child_process.fork to run a corresponding resource / job.
1616
*/
1717
const IPC = require('./ipc.js'),
18-
LOGGER = require('../../utils/log.js'),
19-
log = LOGGER('jobs:executor'),
20-
plugins = require('../../../plugins/pluginManager.js');
18+
LOGGER = require('../../utils/log.js'),
19+
log = LOGGER('jobs:executor'),
20+
plugins = require('../../../plugins/pluginManager.js');
2121

2222

2323
try {
@@ -26,13 +26,13 @@ try {
2626
log.d('[%d]: Starting executor %j', process.pid, options);
2727

2828
const _id = options._id,
29-
nam = options.name,
30-
file = options.file,
31-
json = options.job,
32-
Constructor = require(file),
33-
channel = new IPC.IdChannel(_id),
34-
tmp = new Constructor(json),
35-
db = plugins.singleDefaultConnection();
29+
nam = options.name,
30+
file = options.file,
31+
json = options.job,
32+
Constructor = require(file),
33+
channel = new IPC.IdChannel(_id),
34+
tmp = new Constructor(json),
35+
db = plugins.singleDefaultConnection();
3636

3737
process.on('message', LOGGER.ipcHandler);
3838
channel.attach(process);

0 commit comments

Comments
 (0)