AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-13 09:26:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

cli: also halt on LastErrorException

Browse Source
This commit is contained in:
Moritz Zwerger 2023-10-08 20:52:09 +02:00
parent 2f3f79dfcd
commit ad4fd8b37f
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/de/bixilon/minosoft/terminal/cli/CLI.kt
View File

@ -13,6 +13,7 @@
package de.bixilon.minosoft.terminal.cli package de.bixilon.minosoft.terminal.cli
import com.sun.jna.LastErrorException
import de.bixilon.kutil.latch.AbstractLatch import de.bixilon.kutil.latch.AbstractLatch
import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.kutil.observer.DataObserver.Companion.observe
import de.bixilon.kutil.observer.DataObserver.Companion.observed import de.bixilon.kutil.observer.DataObserver.Companion.observed
@ -84,9 +85,9 @@ object CLI {
line = readLine().trimWhitespaces().replace("\n", "").replace("\r", "") line = readLine().trimWhitespaces().replace("\n", "").replace("\r", "")
terminal.flush() terminal.flush()
} catch (exception: EndOfFileException) { } catch (exception: EndOfFileException) {
Log.log(LogMessageType.GENERAL, LogLevels.VERBOSE) { exception.printStackTrace() } eol(exception); break
Log.log(LogMessageType.GENERAL, LogLevels.WARN) { "End of file error in cli thread. Disabling cli." } } catch (exception: LastErrorException) {
break eol(exception); break
} catch (exception: UserInterruptException) { } catch (exception: UserInterruptException) {
ShutdownManager.shutdown(reason = AbstractShutdownReason.DEFAULT) ShutdownManager.shutdown(reason = AbstractShutdownReason.DEFAULT)
break break
@ -100,6 +101,11 @@ object CLI {
} }
} }
private fun eol(exception: Throwable) {
Log.log(LogMessageType.GENERAL, LogLevels.VERBOSE) { exception.printStackTrace() }
Log.log(LogMessageType.GENERAL, LogLevels.WARN) { "End of file error in cli thread. Disabling cli." }
}
private fun processLine(line: String) { private fun processLine(line: String) {
try { try {
ROOT_NODE.execute(line, connection) ROOT_NODE.execute(line, connection)