haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replay: re-connect after a timeout for various errors. 

Change-Id: I06cb01a0ab826b5723e634bb03e1bca6d99c4db2
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
pull/4349/head
Michael Meeks 2022-03-03 19:55:25 +00:00
parent 42f565faf7
commit 6548759fde
1 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tools/Replay.hpp
View File

@ -107,6 +107,7 @@ struct Stats {
// Avoid a MessageHandler for now.
class StressSocketHandler : public WebSocketHandler
{
SocketPoll &_poll;
TraceFileReader _reader;
TraceFileRecord _next;
std::chrono::steady_clock::time_point _start;
@ -121,9 +122,12 @@ class StressSocketHandler : public WebSocketHandler
public:
StressSocketHandler(const std::shared_ptr<Stats> stats,
const std::string &uri, const std::string &trace) :
StressSocketHandler(SocketPoll &poll, /* bad style */
const std::shared_ptr<Stats> stats,
const std::string &uri, const std::string &trace,
const int delayMs = 0) :
WebSocketHandler(true, true),
_poll(poll),
_reader(trace),
_connecting(true),
_uri(uri),
@ -134,7 +138,7 @@ public:
_logPre = "[" + std::to_string(++number) + "] ";
std::cerr << "Attempt connect to " << uri << " for trace " << _trace << "\n";
getNextRecord();
_start = std::chrono::steady_clock::now();
_start = std::chrono::steady_clock::now() + std::chrono::milliseconds(delayMs);
_nextPing = _start + std::chrono::milliseconds((long)(std::rand() * 1000.0) / RAND_MAX);
_lastTile = _start;
sendMessage("load url=" + uri);
@ -289,10 +293,36 @@ public:
sendMessage("tileprocessed tile=" + desc.generateID());
std::cerr << _logPre << "Sent tileprocessed tile= " + desc.generateID() << "\n";
} if (tokens.equals(0, "error:")) {
std::cerr << _logPre << "Error while processing " << _uri
<< " and trace " << _trace << ":\n"
<< firstLine << "\n";
exit(1);
bool reconnect = false;
if (firstLine == "error: cmd=load kind=docunloading")
{
std::cerr << ": wait and try again later ...!\n";
reconnect = true;
}
else if (firstLine == "error: cmd=storage kind=documentconflict")
{
std::cerr << "Document conflict - need to resolve it first ...\n";
sendMessage("closedocument");
reconnect = true;
}
else
{
std::cerr << _logPre << "Error while processing " << _uri
<< " and trace " << _trace << ":\n"
<< "'" << firstLine << "'\n";
}
if (reconnect)
{
shutdown(true, "bye");
auto handler = std::make_shared<StressSocketHandler>(
_poll, _stats, _uri, _trace, 1000 /* delay 1 second */);
_poll.insertNewWebSocketSync(Poco::URI(_uri), handler);
return;
}
else
exit(1);
}
// FIXME: implement code to send new view-ports based
@ -316,7 +346,7 @@ public:
Poco::URI::encode(file, ":/?", wrap); // double encode.
std::string uri = server + "/cool/" + wrap + "/ws";
auto handler = std::make_shared<StressSocketHandler>(optStats, file, tracePath);
auto handler = std::make_shared<StressSocketHandler>(poll, optStats, file, tracePath);
poll.insertNewWebSocketSync(Poco::URI(uri), handler);
}