Skip to content
This repository was archived by the owner on Sep 20, 2018. It is now read-only.

Commit c98e908

Browse files
kitelifekitelife
committed
var to let
1 parent 19a1e95 commit c98e908

19 files changed

+173
-173
lines changed

‎app.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
// store global var
66
global.RootDir = __dirname;
77

8-
var cluster = require('cluster');
9-
var numCPUs = require('os').cpus().length;
10-
var http = require('http');
8+
let cluster = require('cluster');
9+
let numCPUs = require('os').cpus().length;
10+
let http = require('http');
1111

12-
var config = require('./config');
13-
var routes = require('./routes');
14-
var Logger = require('./utils/logger');
12+
let config = require('./config');
13+
let routes = require('./routes');
14+
let Logger = require('./utils/logger');
1515

1616
// 配置检查
1717
if (!config.sentinels.length) {
@@ -21,7 +21,7 @@ if (!config.sentinels.length) {
2121
if (cluster.isMaster) {
2222
// Fork workers.
2323
Logger.info('主进程id: %d', process.pid);
24-
for (var i = 0; i < numCPUs; i++) {
24+
for (let i = 0; i < numCPUs; i++) {
2525
cluster.fork();
2626
}
2727

‎config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
const PORT = 8080;
1414
const STORAGE_FILE_PATH = './rsm.db';
1515

16-
var configuration = {
16+
let configuration = {
1717
debug: false,
1818
log_level: 'debug',
1919
port: PORT,

‎controllers/cmd.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
'use strict';
99

10-
var Redis = require('ioredis');
11-
var ValidRedisCMDs = require('ioredis/commands');
10+
let Redis = require('ioredis');
11+
let ValidRedisCMDs = require('ioredis/commands');
1212

13-
var cmdRespParser = require('../utils/cmdRespParser');
14-
var config = require('../config');
13+
let cmdRespParser = require('../utils/cmdRespParser');
14+
let config = require('../config');
1515

1616
// 检测 命令 是否有效
1717
function isValidCommand(cmd) {
@@ -32,19 +32,19 @@ function cmd(req, res) {
3232
* 1. cmd: 大写的Redis命令
3333
* 2. params: 命令参数, 多个参数以空格分隔
3434
*/
35-
var cmd = req.body.cmd.toUpperCase();
35+
let cmd = req.body.cmd.toUpperCase();
3636
if (!cmd || !isValidCommand(cmd)) {
3737
res.toResponse('参数cmd不合法!', 400);
3838
return;
3939
}
40-
var params = req.body.params;
40+
let params = req.body.params;
4141
if (params === undefined) {
4242
res.toResponse('缺少必要的请求参数!', 400);
4343
return;
4444
}
4545
params = params.split(' ');
4646

47-
var RedisServer = new Redis({
47+
let RedisServer = new Redis({
4848
sentinels: config.sentinels,
4949
name: config.master_name,
5050
password: config.auth

‎controllers/cmd_page.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use strict';
22

3-
var ValidRedisCMDs = require('ioredis/commands');
3+
let ValidRedisCMDs = require('ioredis/commands');
44

5-
var Template = require('../utils/template');
5+
let Template = require('../utils/template');
66

77
function _cmd_page(req, res) {
88
res.write(Template.render('views/cmd.jade', {

‎controllers/home.js

+18-18
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
'use strict';
99

10-
var DB = require('../models/db');
11-
var Template = require('../utils/template');
12-
var Time = require('../utils/time');
13-
var Logger = require('../utils/logger');
10+
let DB = require('../models/db');
11+
let Template = require('../utils/template');
12+
let Time = require('../utils/time');
13+
let Logger = require('../utils/logger');
1414

1515
/**
1616
* `/home`控制器
@@ -35,18 +35,18 @@ function _home(req, res) {
3535
result = {master: '{}', slaves: '{}', sentinels: '{}'};
3636
}
3737

38-
var clusterInfo = {
38+
let clusterInfo = {
3939
master: JSON.parse(result.master),
4040
slaves: JSON.parse(result.slaves),
4141
sentinels: JSON.parse(result.sentinels)
4242
};
4343

44-
var allSentinel = [];
45-
var redisSentinels = clusterInfo.sentinels;
44+
let allSentinel = [];
45+
let redisSentinels = clusterInfo.sentinels;
4646

4747
if (redisSentinels) {
4848
Object.getOwnPropertyNames(redisSentinels).forEach(ele => {
49-
var thisSentinel = redisSentinels[ele];
49+
let thisSentinel = redisSentinels[ele];
5050
allSentinel.push({
5151
address: ele,
5252
version: thisSentinel.redis_version,
@@ -57,25 +57,25 @@ function _home(req, res) {
5757
});
5858
}
5959

60-
var allRedis = [];
60+
let allRedis = [];
6161

62-
var rawRedisServers = {};
63-
var redisMaster = clusterInfo.master;
62+
let rawRedisServers = {};
63+
let redisMaster = clusterInfo.master;
6464
if (redisMaster && Object.getOwnPropertyNames(redisMaster).length) {
6565
rawRedisServers[redisMaster.ip + ':' + redisMaster.port] = redisMaster;
6666
}
67-
var redisSlaves = clusterInfo.slaves;
67+
let redisSlaves = clusterInfo.slaves;
6868
if (redisSlaves) {
6969
rawRedisServers = Object.assign(rawRedisServers, redisSlaves);
7070
}
7171

7272
Object.getOwnPropertyNames(rawRedisServers).forEach(function(ele) {
73-
var thisRedisServer = rawRedisServers[ele];
73+
let thisRedisServer = rawRedisServers[ele];
7474

75-
var hitRate = 0;
76-
var keySpaceHits = parseInt(thisRedisServer.keyspace_hits);
77-
var keySpaceMisses = parseInt(thisRedisServer.keyspace_misses);
78-
var keySpaceHitMisses = keySpaceHits + keySpaceMisses;
75+
let hitRate = 0;
76+
let keySpaceHits = parseInt(thisRedisServer.keyspace_hits);
77+
let keySpaceMisses = parseInt(thisRedisServer.keyspace_misses);
78+
let keySpaceHitMisses = keySpaceHits + keySpaceMisses;
7979
if (keySpaceHitMisses > 0) {
8080
hitRate = (keySpaceHits / keySpaceHitMisses).toFixed(3);
8181
}
@@ -105,7 +105,7 @@ function _home(req, res) {
105105
});
106106
});
107107

108-
var data = {
108+
let data = {
109109
sentinels: allSentinel,
110110
redises: allRedis
111111
};

‎controllers/stat.js

+24-24
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
'use strict';
66

7-
var DB = require('../models/db');
7+
let DB = require('../models/db');
88

9-
var StatMapper = {
9+
let StatMapper = {
1010
'connected_client': DB.getRangeConnectedClient,
1111
'used_memory': DB.getRangeUsedMemory,
1212
'cmd_ps': DB.getRangeCMDPS
1313
};
1414

15-
var graphTypeMapper = {
15+
let graphTypeMapper = {
1616
'connected_client': {
1717
type: 'spline',
1818
yAxis: {
@@ -33,13 +33,13 @@ var graphTypeMapper = {
3333
}
3434
};
3535

36-
var reduceAlgoMapper = {
36+
let reduceAlgoMapper = {
3737
default: null,
3838
by_ave: _byAverage,
3939
by_max: _byMax
4040
};
4141

42-
var DATA_POINT_THRESHOLD = 1000;
42+
let DATA_POINT_THRESHOLD = 1000;
4343

4444
function _checkStatName(statName) {
4545
return !!(statName in StatMapper);
@@ -94,10 +94,10 @@ function _findReduceFactor(length) {
9494
* @private
9595
*/
9696
function _byMax(rangeDataSet, beginIndex, reduceFactor, valueType) {
97-
var rangeMax = null;
98-
var upLimit = beginIndex + reduceFactor;
99-
for(var index = beginIndex; index < upLimit; index++) {
100-
var thisDataPoint = rangeDataSet[index];
97+
let rangeMax = null;
98+
let upLimit = beginIndex + reduceFactor;
99+
for(let index = beginIndex; index < upLimit; index++) {
100+
let thisDataPoint = rangeDataSet[index];
101101
if (rangeMax === null) {
102102
rangeMax = thisDataPoint;
103103
continue;
@@ -119,12 +119,12 @@ function _byMax(rangeDataSet, beginIndex, reduceFactor, valueType) {
119119
* @private
120120
*/
121121
function _byAverage(rangeDataSet, beginIndex, reduceFactor, valueType) {
122-
var valueSum = 0;
123-
var upLimit = beginIndex + reduceFactor;
124-
for(var index = beginIndex; index < upLimit; index++) {
122+
let valueSum = 0;
123+
let upLimit = beginIndex + reduceFactor;
124+
for(let index = beginIndex; index < upLimit; index++) {
125125
valueSum += rangeDataSet[index].value;
126126
}
127-
var aveValue = null;
127+
let aveValue = null;
128128
if (valueType === 'int') {
129129
aveValue = Math.ceil(valueSum/reduceFactor);
130130
} else {
@@ -142,20 +142,20 @@ function _byAverage(rangeDataSet, beginIndex, reduceFactor, valueType) {
142142
* @private
143143
*/
144144
function _reduceDataSet(dataSet, algorithm, valueType) {
145-
var dataSetLength = dataSet.length;
146-
var reduceFactor = _findReduceFactor(dataSetLength);
145+
let dataSetLength = dataSet.length;
146+
let reduceFactor = _findReduceFactor(dataSetLength);
147147
if (reduceFactor === 0) {
148148
return _justFormatDataSet(dataSet);
149149
}
150-
var reducedDataSet = [];
151-
var lastIndex = dataSetLength - (dataSetLength % reduceFactor);
152-
for(var index = 0; index < lastIndex; index = index+reduceFactor) {
150+
let reducedDataSet = [];
151+
let lastIndex = dataSetLength - (dataSetLength % reduceFactor);
152+
for(let index = 0; index < lastIndex; index = index+reduceFactor) {
153153
reducedDataSet.push(algorithm(dataSet, index, reduceFactor, valueType));
154154
}
155155
//
156-
var hasIteratedLength = reducedDataSet.length * reduceFactor;
156+
let hasIteratedLength = reducedDataSet.length * reduceFactor;
157157
if (hasIteratedLength < dataSetLength) {
158-
for(var otherIndex = hasIteratedLength; otherIndex < dataSetLength; otherIndex++) {
158+
for(let otherIndex = hasIteratedLength; otherIndex < dataSetLength; otherIndex++) {
159159
reducedDataSet.push([dataSet[otherIndex].created_time, dataSet[otherIndex].value]);
160160
}
161161
}
@@ -169,7 +169,7 @@ function _reduceDataSet(dataSet, algorithm, valueType) {
169169
* @private
170170
*/
171171
function _justFormatDataSet(dataSet) {
172-
var formatedDataSet = [];
172+
let formatedDataSet = [];
173173
dataSet.forEach(data => {
174174
formatedDataSet.push([data.created_time, data.value]);
175175
});
@@ -223,21 +223,21 @@ function _stat(req, res) {
223223
return;
224224
}
225225

226-
var targetSeriesData = {};
226+
let targetSeriesData = {};
227227

228228
result.forEach(record => {
229229
if (!(record.server in targetSeriesData)) {
230230
targetSeriesData[record.server] = [];
231231
}
232232
targetSeriesData[record.server].push({created_time: Date.parse(record.created_time), value: record.value});
233233
});
234-
var respData = {
234+
let respData = {
235235
xAxis: graphTypeMapper[statName].xAxis ? graphTypeMapper[statName].xAxis : null,
236236
yAxis: graphTypeMapper[statName].yAxis ? graphTypeMapper[statName].yAxis : null,
237237
series: []
238238
};
239239
Object.getOwnPropertyNames(targetSeriesData).forEach(server => {
240-
var mySeriesData = null;
240+
let mySeriesData = null;
241241
if (reduceWay === 'default') {
242242
mySeriesData = _justFormatDataSet(targetSeriesData[server]);
243243
} else {

‎controllers/stat_page.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
'use strict';
22

3-
var Template = require('../utils/template');
4-
var DB = require('../models/db');
5-
var Logger = require('../utils/logger');
3+
let Template = require('../utils/template');
4+
let DB = require('../models/db');
5+
let Logger = require('../utils/logger');
66

7-
var serverIndexs = {
7+
let serverIndexs = {
88
cmd_ps: '每秒处理命令数',
99
connected_client: '客户端连接数',
1010
used_memory: '内存使用量'
1111
};
1212

13-
var reduceWays = {
13+
let reduceWays = {
1414
default: '不聚合(时间范围大时慎重使用)',
1515
by_max: '最大值',
1616
by_ave: '均值'
@@ -27,9 +27,9 @@ function _stat_page(req, res) {
2727
return;
2828
}
2929

30-
var redisServers = [];
31-
var redisMaster = JSON.parse(result.master);
32-
var redisSlaves = JSON.parse(result.slaves);
30+
let redisServers = [];
31+
let redisMaster = JSON.parse(result.master);
32+
let redisSlaves = JSON.parse(result.slaves);
3333

3434
redisServers.push(redisMaster.ip + ':' + redisMaster.port);
3535
Object.getOwnPropertyNames(redisSlaves).forEach(slave => {

‎god.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
'use strict';
44

5-
var child_process = require('child_process');
5+
let child_process = require('child_process');
66

7-
var monitor = child_process.fork('./monitor/monitor.js');
7+
let monitor = child_process.fork('./monitor/monitor.js');
88

9-
var exitCallback = function (code, signal) {
9+
let exitCallback = function (code, signal) {
1010
console.log('monitor.js, code: ' + code + ', signal: ' + signal);
1111
if (signal === 'SIGTERM') {
1212
return;
1313
}
1414
monitor = child_process.fork('./monitor/monitor.js');
1515
monitor.on('exit', exitCallback);
16-
}
16+
};
1717

1818
monitor.on('exit', exitCallback);
1919

0 commit comments

Comments
 (0)