caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Recover after command failure by returning to pump main menu, so

Browse source 
subsequent commands won't fail.
This commit is contained in:
Johannes Mockenhaupt 2017-11-14 19:00:23 +01:00
parent e27730229e
commit 7c662345ae
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
View file

@ -340,11 +340,16 @@ public class RuffyScripter implements RuffyCommands {
// TOD under which circumstances can these occur? // TOD under which circumstances can these occur?
} catch (CommandException e) { } catch (CommandException e) {
log.error("CommandException while executing command", e); log.error("CommandException while executing command", e);
recoverFromCommandFailure();
return activeCmd.getResult().success(false).state(readPumpStateInternal()); return activeCmd.getResult().success(false).state(readPumpStateInternal());
} catch (Exception e) { } catch (Exception e) {
log.error("Unexpected exception communication with ruffy", e); log.error("Unexpected exception communication with ruffy", e);
recoverFromCommandFailure();
return activeCmd.getResult().success(false).exception(e).state(readPumpStateInternal()); return activeCmd.getResult().success(false).exception(e).state(readPumpStateInternal());
} finally { } finally {
if (activeCmd.getResult().success) {
log.warn("Command " + activeCmd + " successful, but finished leaving pump on menu " + getCurrentMenuName());
}
activeCmd = null; activeCmd = null;
} }
} }
@ -399,6 +404,23 @@ public class RuffyScripter implements RuffyCommands {
} }
} }
/** Returns to the main menu (if possible) after a command failure, so that subsequent commands
* reusing the connection won't fail. */
private void recoverFromCommandFailure() {
Menu menu = this.currentMenu;
if (menu == null) {
return;
}
MenuType type = menu.getType();
if (type != MenuType.WARNING_OR_ERROR && type != MenuType.MAIN_MENU) {
try {
returnToRootMenu();
} catch (Exception e) {
log.warn("Error returning to main menu, when trying to recover from command failure", e);
}
}
}
/** If there's an issue, this times out eventually and throws a CommandException */ /** If there's an issue, this times out eventually and throws a CommandException */
private void ensureConnected() { private void ensureConnected() {
try { try {