Merge remote-tracking branch 'origin/dev' into dev

app/electron/main.js

@@ -544,6 +544,7 @@ const initKernel = (initData) => {
       const initDatas = initData.split('-')
       cmds.push('--workspace', initDatas[0])
       cmds.push('--lang', initDatas[1])
+      cmds.push("--resident", "false")
       cmd = `ui version [${appVer}], booting kernel [${kernelPath} --wd=${appDir} --workspace=${initDatas[0]} --lang=${initDatas[1]}]`
     }
     writeLog(cmd)

kernel/model/process.go

@@ -33,8 +33,11 @@ func HookResident() {
 
 	for range time.Tick(time.Second * 30) {
 		if 0 == util.CountSessions() {
-			logging.LogInfof("no active session, exit kernel process now")
-			Close(false, 1)
+			time.Sleep(time.Second * 7)
+			if 0 == util.CountSessions() {
+				logging.LogInfof("no active session, exit kernel process now")
+				Close(false, 1)
+			}
 		}
 	}
 }

kernel/util/runtime.go

@@ -47,13 +47,15 @@ func logBootInfo() {
 	logging.LogInfof("kernel is booting:\n"+
 		"    * ver [%s]\n"+
 		"    * arch [%s]\n"+
+		"    * resident [%v]\n"+
+		"    * pid [%d]\n"+
 		"    * runtime mode [%s]\n"+
 		"    * working directory [%s]\n"+
 		"    * read only [%v]\n"+
 		"    * container [%s]\n"+
 		"    * database [ver=%s]\n"+
 		"    * workspace directory [%s, data %s]",
-		Ver, runtime.GOARCH, Mode, WorkingDir, ReadOnly, Container, DatabaseVer, WorkspaceDir, dataDirSize)
+		Ver, runtime.GOARCH, Resident, os.Getpid(), Mode, WorkingDir, ReadOnly, Container, DatabaseVer, WorkspaceDir, dataDirSize)
 }
 
 func IsMutexLocked(m *sync.Mutex) bool {