strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
libreoffice-online/loolwsd/UserMessages.hpp

24 lines
1,017 B
C++
Raw Normal View History

loolwsd: cleanup and improve WSD request handlers Standardized error handling in request-handlers. There is a new family of internal exeptions designed to signify the type of error and how to handle it. All handlers must throw one of those errors and they will be translated to the correct HTTP response when caught. Since some requests send a response as part of their handling (convert-to, for example) those handlers must return a flag signlaning whether or not they sent a response. If not, HTTP OK response is sent at the end of the handler. To complicate things, some requests upgrade the connection to WebSocket. In those cases errors must be sent via the WebSocket and not as an HTTP response. The error message sent can (and in most cases should) be displayed to the end-user. A new file, UserMessages.hpp, has been added to hold user-visible messages that can be reviewed and translated. Change-Id: Icc725f3313446d4514cf6d092635158ee7171f5d Reviewed-on: https://gerrit.libreoffice.org/24133 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-04-16 11:56:23 -05:00
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
// A list of user-visible messages.
// This list is intended to be centralized for review and i18n support.
#ifndef INCLUDED_USERMESSAGES_HPP
#define INCLUDED_USERMESSAGES_HPP
loolwsd: first character of 404 messages are trimmed For some reason Poco trims the first character of 404 and other HTTP error messages. We need to prefix messages with a space to avoid having the first character chopped-off. Change-Id: I8cbda9f4b5df894418f1dedf390b8b43a61e5d11 Reviewed-on: https://gerrit.libreoffice.org/28521 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-08-30 17:16:03 -05:00
//NOTE: For whatever reason Poco seems to trim the first character.
constexpr auto SERVICE_UNAVALABLE_INTERNAL_ERROR = " Service is unavailable. Please try again later and report to your administrator if the issue persists.";
loolwsd: error message is localizable
2016-10-01 07:45:08 -05:00
constexpr auto SERVICE_UNAVALABLE_LIMIT_REACHED = "error: cmd=socket kind=close code=%d";
constexpr auto PAYLOAD_UNAVALABLE_LIMIT_REACHED = "error: cmd=socket kind=limitreached params=%d,%d";
loolwsd: cleanup and improve WSD request handlers Standardized error handling in request-handlers. There is a new family of internal exeptions designed to signify the type of error and how to handle it. All handlers must throw one of those errors and they will be translated to the correct HTTP response when caught. Since some requests send a response as part of their handling (convert-to, for example) those handlers must return a flag signlaning whether or not they sent a response. If not, HTTP OK response is sent at the end of the handler. To complicate things, some requests upgrade the connection to WebSocket. In those cases errors must be sent via the WebSocket and not as an HTTP response. The error message sent can (and in most cases should) be displayed to the end-user. A new file, UserMessages.hpp, has been added to hold user-visible messages that can be reviewed and translated. Change-Id: Icc725f3313446d4514cf6d092635158ee7171f5d Reviewed-on: https://gerrit.libreoffice.org/24133 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-04-16 11:56:23 -05:00
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Reference in a new issue Copy permalink