Skip to content

CBL-6960: Consider to restore the logs in destructors #2273

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.

Sign up for GitHub

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

Merged
snej merged 1 commit into from
May 20, 2025
Merged

CBL-6960: Consider to restore the logs in destructors #2273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 LiteCore/Database/LiveQuerier.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ namespace litecore {

LiveQuerier::~LiveQuerier() {
if ( _query ) _stop();
//logVerbose("Deleted"); // It is not currently safe to log in a Logging destructor
logVerbose("Deleted");
}

std::string LiveQuerier::loggingIdentifier() const { return string(_expression); }
Expand Down
2 changes: 1 addition & 1 deletion LiteCore/Database/SequenceTracker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ namespace litecore {
}

CollectionChangeNotifier::~CollectionChangeNotifier() {
//if ( callback ) logInfo("Deleting"); // It is not currently safe to log in a Logging destructor
if ( callback ) logInfo("Deleting");

if ( tracker ) { tracker->removePlaceholder(_placeholder); }
}
Expand Down
4 changes: 1 addition & 3 deletions LiteCore/Query/SQLiteQuery.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,7 @@ namespace litecore {
rowCount, recording->data().size, elapsedTime * 1000);
}

~SQLiteQueryEnumerator() override {
//logInfo("Deleted"); // It is not currently safe to log in a Logging destructor
}
~SQLiteQueryEnumerator() override { logInfo("Deleted"); }

int64_t getRowCount() const override {
return _recording->asArray()->count() / 2; // (every other row is a column bitmap)
Expand Down
4 changes: 1 addition & 3 deletions LiteCore/Storage/DataFile.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,7 @@ namespace litecore {

for ( auto& i : _keyStores ) { i.second->close(); }
_close(forDelete);
if ( _shared->removeDataFile(this) ) {
//logInfo("Closing database"); // It is not currently safe to log in a Logging destructor
}
if ( _shared->removeDataFile(this) ) { logInfo("Closing database"); }
}

void DataFile::reopen() {
Expand Down
2 changes: 0 additions & 2 deletions Networking/BLIP/BLIPConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ namespace litecore::blip {

protected:
~BLIPIO() override {
#if 0 // It is not currently safe to log in a Logging destructor
double outboxDepth =
(_countOutboxDepth != 0)
? (static_cast<double>(_totalOutboxDepth) / static_cast<double>(_countOutboxDepth))
Expand All @@ -173,7 +172,6 @@ namespace litecore::blip {
_countOutboxDepth, _totalBytesWritten, _numRequestsReceived, _totalBytesRead, _timeOpen.elapsed(),
_maxOutboxDepth, outboxDepth);
logStats();
#endif
}

void onWebSocketGotHTTPResponse(int status, const websocket::Headers& headers) override {
Expand Down
2 changes: 1 addition & 1 deletion Replicator/Worker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ namespace litecore::repl {
: Worker(&parent->connection(), parent, parent->_options, parent->_db, namePrefix, coll) {}

Worker::~Worker() {
//if ( _importance ) logStats(); // It is not currently safe to log in a Logging destructor
if ( _importance ) logStats();
logDebug("destructing (%p); actorName='%s'", this, actorName().c_str());
}

Expand Down
Loading