[#3896cn] Add support for suspending a server and blocking boot when suspended

2019-11-30 15:19:08 -08:00
parent fa42ed92fb
commit 0ce95aa2e3
5 changed files with 78 additions and 3 deletions
--- a/websocket.go
+++ b/websocket.go
@@ -276,8 +276,10 @@ func (wsh *WebsocketHandler) SendErrorJson(err error) error {
 	defer wsh.Mutex.Unlock()

 	message := "an unexpected error was encountered while handling this request"
-	if wsh.JWT != nil && wsh.JWT.HasPermission(PermissionReceiveErrors) {
-		message = err.Error()
+	if wsh.JWT != nil {
+		if server.IsSuspendedError(err) || wsh.JWT.HasPermission(PermissionReceiveErrors) {
+			message = err.Error()
+		}
 	}

 	m, u := wsh.GetErrorMessage(message)