Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update expensify_prod branch #1778

Merged
merged 2 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BedrockServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2045,7 +2045,7 @@ void BedrockServer::_acceptSockets() {
uint64_t now = STimeNow();
if ((port != _controlPort) && (_outstandingSocketThreads >= _maxSocketThreads)) {
if ((lastLogged < now - 3'000'000)) {
SINFO("Not accepting any new socket threads as we already have " << _outstandingSocketThreads << " of " << _maxSocketThreads);
SWARN("Not accepting any new socket threads as we already have " << _outstandingSocketThreads << " of " << _maxSocketThreads);
lastLogged = now;
}
return;
Expand Down
4 changes: 2 additions & 2 deletions sqlitecluster/SQLitePool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ size_t SQLitePool::getIndex(bool createHandle) {
return index;
} else {
// Wait for a handle.
SINFO("Waiting for DB handle");
SWARN("Waiting for DB handle");
_wait.wait(lock);
}
}
Expand Down Expand Up @@ -88,7 +88,7 @@ void SQLitePool::returnToPool(size_t index) {
}

SQLiteScopedHandle::SQLiteScopedHandle(SQLitePool& pool, size_t index) : _pool(pool), _index(index)
{}
{}

SQLiteScopedHandle::~SQLiteScopedHandle() {
_pool.returnToPool(_index);
Expand Down