jsir 2.5.8 → 2.5.9
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/deps/room.js +3 -2
- package/deps/setting.js +3 -2
- package/deps/util.js +1 -1
- package/package.json +1 -1
package/deps/room.js
CHANGED
|
@@ -298,7 +298,7 @@ async function processTasks() {
|
|
|
298
298
|
let unHandleKey = null;
|
|
299
299
|
for (let key of Object.keys(defTasks)) {
|
|
300
300
|
if (!tasks[key]) {
|
|
301
|
-
if (key.indexOf("*") !== -1 &&
|
|
301
|
+
if (key.indexOf("*") !== -1 && setting.defaultPort !== setting.selfJsir.port) {
|
|
302
302
|
continue;
|
|
303
303
|
}
|
|
304
304
|
unHandleKey = key
|
|
@@ -424,7 +424,7 @@ async function initRoomJsir(room) {
|
|
|
424
424
|
}
|
|
425
425
|
// 初始化jsir
|
|
426
426
|
let lastJsir = room.jsirs[process.pid]
|
|
427
|
-
|
|
427
|
+
setting.selfJsir = {
|
|
428
428
|
pid: process.pid,
|
|
429
429
|
space: setting.defaultSpace,
|
|
430
430
|
tips: getKeyTips().reduce((obj, key, index) => {
|
|
@@ -440,6 +440,7 @@ async function initRoomJsir(room) {
|
|
|
440
440
|
version: packageJson.version,
|
|
441
441
|
upTime: formatUptime()
|
|
442
442
|
}
|
|
443
|
+
room.jsirs[process.pid] = setting.selfJsir
|
|
443
444
|
}
|
|
444
445
|
|
|
445
446
|
/**
|
package/deps/setting.js
CHANGED
|
@@ -24,6 +24,7 @@ module.exports = {
|
|
|
24
24
|
roomTid: [],
|
|
25
25
|
nodeMap: {},
|
|
26
26
|
selfRoom: {},
|
|
27
|
+
selfJsir: {},
|
|
27
28
|
rooms: [],
|
|
28
29
|
server: null,
|
|
29
30
|
disableConnect: {},
|
|
@@ -35,9 +36,9 @@ module.exports = {
|
|
|
35
36
|
defaultPort: 52108,
|
|
36
37
|
reqNodeDefaultTimeout: 33000,
|
|
37
38
|
reqNodeTimeouts: {
|
|
38
|
-
'/':
|
|
39
|
+
'/': 2000
|
|
39
40
|
},
|
|
40
|
-
roomTimer:
|
|
41
|
+
roomTimer: 2000,
|
|
41
42
|
serverSignExpire: 6000,
|
|
42
43
|
roomHeartbeatExpire: 9000,
|
|
43
44
|
configMainFnKey: "config/main",
|
package/deps/util.js
CHANGED