From db43ea85f057ae19b26424e403d1c511f0e5b57d Mon Sep 17 00:00:00 2001 From: Kristijan Mitrovic Date: Mon, 8 Jun 2020 15:07:15 +0200 Subject: [PATCH] Use better err templates in restore bubble call --- .../bubble/service/cloud/StandardNetworkService.java | 12 +++++++++--- .../server/post_auth/ResourceMessages.properties | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java b/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java index 9b116e8a..edf111b8 100644 --- a/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java +++ b/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java @@ -627,10 +627,10 @@ public class StandardNetworkService implements NetworkService { // sanity checks final List nodes = nodeDAO.findByNetwork(network.getUuid()); if (!nodes.isEmpty()) { - throw invalidEx("err.network.restore.nodesExist"); + throw invalidEx("err.networkRestore.nodesExist"); } if (network.getState() != BubbleNetworkState.stopped) { - throw invalidEx("err.network.restore.notStopped"); + throw invalidEx("err.networkRestore.notStopped"); } network.setState(BubbleNetworkState.starting); networkDAO.update(network); @@ -661,8 +661,14 @@ public class StandardNetworkService implements NetworkService { return newNodeRequest; + } catch (SimpleViolationException e) { + // TODO: should this go here, or just in some specific cases within above try block? + // also, should this go into other method here that are locking network? + try { unlockNetwork(network.getUuid(), lock); } catch (Exception e1) { } + log.error("startNetwork: original SimpleViolationException: ", e); + throw e; } catch (Exception e) { - return die("startNetwork: "+e, e); + return die("startNetwork: " + e, e); } } diff --git a/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties b/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties index cad95f9d..60d8055c 100644 --- a/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties +++ b/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties @@ -634,8 +634,8 @@ err.networkKeys.invalid=Bubble Restore Key was not valid err.networkName.required=Network name is required err.network.cannotStartInCurrentState=Cannot proceed: network cannot be started in its current state err.network.required=Network is required -err.network.restore.nodesExist=Cannot restore when active nodes exist -err.network.restore.notStopped=Cannot restore when network is running +err.networkRestore.nodesExist=Cannot restore when active nodes exist +err.networkRestore.notStopped=Cannot restore when network is running err.nick.alreadyInUse=Nickname is already in use by another contact err.nick.tooLong=Nickname cannot be longer than 100 characters err.node.notInitialized=Node is not initialized