jsir 2.6.9 → 2.6.10
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/cmd/oaa.js +3 -1
- package/deps/room.js +3 -1
- package/package.json +1 -1
package/cmd/oaa.js
CHANGED
|
@@ -13,7 +13,7 @@ const {
|
|
|
13
13
|
getFullPath, parseUniqueName, toUniqueName, isJsirFileName, toJsirFileName,
|
|
14
14
|
getAlias, wrapperJsirText, eia, getKeyTips, getValTips, getJsirTypeKey,
|
|
15
15
|
createDetachedProcess, interceptStdStreams,
|
|
16
|
-
draftModify, isRunningInBackground, fileJson, fileLock, processLock
|
|
16
|
+
draftModify, isRunningInBackground, fileJson, fileLock, processLock, cleanFileLocks
|
|
17
17
|
} = $lib;
|
|
18
18
|
const _args = process.argv.slice(2).map(trim);
|
|
19
19
|
const evalCode = require('../deps/evalCode')
|
|
@@ -184,6 +184,8 @@ function checkWorkspaces() {
|
|
|
184
184
|
}
|
|
185
185
|
|
|
186
186
|
async function start() {
|
|
187
|
+
cleanFileLocks();
|
|
188
|
+
|
|
187
189
|
setting.wrapperInput = wrapperInput;
|
|
188
190
|
interceptStdStreams()
|
|
189
191
|
checkWorkspaces()
|
package/deps/room.js
CHANGED
|
@@ -307,6 +307,9 @@ async function processTasks() {
|
|
|
307
307
|
}
|
|
308
308
|
|
|
309
309
|
async function initRoom() {
|
|
310
|
+
if (process.pid === setting.defaultPort) {
|
|
311
|
+
cleanFileLocks();
|
|
312
|
+
}
|
|
310
313
|
setting.roomTime = Date.now();
|
|
311
314
|
setting.nodeMap = await fileJson(jsirNodesFile);
|
|
312
315
|
let roomUpdateTouchTime = false;
|
|
@@ -320,7 +323,6 @@ async function initRoom() {
|
|
|
320
323
|
if (roomUpdateTouchTime) {
|
|
321
324
|
fileLock(updateRoomInfoLockKey, async () => {
|
|
322
325
|
let pros = []
|
|
323
|
-
pros.push(cleanFileLocks())
|
|
324
326
|
pros.push(syncRooms())
|
|
325
327
|
if (setting.serviceFns[setting.configMainFnKey] && !getConfig("configMain")) {
|
|
326
328
|
pros.push(syncConfigs())
|