gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RethinkDB fixes.

Browse Source
This commit is contained in:
Adam Ierymenko
2017-11-03 20:55:16 -04:00
parent b68bca35db
commit 92c7070aa8
6 changed files with 204 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
service/OneService.cpp
View File

@@ -867,10 +867,14 @@ public:
clockShouldBe = now + (uint64_t)delay;
_phy.poll(delay);
}
} catch (std::exception &e) {
Mutex::Lock _l(_termReason_m);
_termReason = ONE_UNRECOVERABLE_ERROR;
_fatalErrorMessage = std::string("unexpected exception in main thread: ")+e.what();
} catch ( ... ) {
Mutex::Lock _l(_termReason_m);
_termReason = ONE_UNRECOVERABLE_ERROR;
_fatalErrorMessage = "unexpected exception in main thread";
_fatalErrorMessage = "unexpected exception in main thread: unknown exception";
}
try {