Build-To-Use: 3.3.0-71

71af00e Fixed BonjourProvider not notifying some peer changes (#2280)
CBL-6960: Consider to restore the logs in destructors
f35bcc4 Added C4Replicator::Parameters::removeCollection() (#2279) Fixed adding collections to C4Listener. (EE)

Author: jianminzhao

C/Cpp_include/c4PeerDiscovery.hh

@@ -164,31 +164,21 @@ class C4PeerDiscovery {
     friend class C4Peer;
     friend class C4PeerDiscoveryProvider;
 
-    /// Reports that browsing has started, stopped or failed.
-    /// If `state` is false, this method will call `removePeer` on all online peers.
     void browseStateChanged(C4PeerDiscoveryProvider*, bool state, C4Error = {});
 
-    /// Reports that publishing has started, stopped or failed.
     void publishStateChanged(C4PeerDiscoveryProvider*, bool state, C4Error = {});
 
-    /// Registers a newly discovered peer with to C4PeerDiscovery's set of peers, and returns it.
-    /// If there is already a peer with this id, returns the existing one instead of registering the new one.
-    /// (If you want to avoid creating a redundant peer, you can call \ref C4PeerDiscovery::peerWithID to check.)
     fleece::Ref<C4Peer> addPeer(C4Peer*, bool moreComing);
 
-    /// Unregisters the peer with this ID.
     bool removePeer(std::string_view id, bool moreComing);
 
-    /// Notifies observers about an incoming connection from a peer.
-    /// @note  If the connection is not accepted, caller must close the C4Socket.
-    /// @returns  true if the connection was accepted, false if not.
+    void noMorePeersComing();
+
     bool notifyIncomingConnection(C4Peer*, C4Socket*);
 
     void notifyMetadataChanged(C4Peer*);
 
   private:
-    void notifyPeerChanges();
-
     std::mutex                                           _mutex;
     std::string const                                    _peerGroupID;
     C4PeerID const                                       _peerID;
@@ -402,6 +392,8 @@ class C4PeerDiscoveryProvider : public fleece::InstanceCounted {
     ///                    into one `addedPeers` notification.
     bool removePeer(std::string_view id, bool moreComing) { return _discovery.removePeer(id, moreComing); }
 
+    void noMorePeersComing() { _discovery.noMorePeersComing(); }
+
     /// Notifies observers about an incoming connection from a peer.
     /// @note  If the connection is not accepted, caller must close the C4Socket.
     /// @returns  true if the connection was accepted, false if not.

C/Cpp_include/c4Replicator.hh

@@ -91,6 +91,8 @@ struct C4Replicator
         C4ReplicationCollection& addCollection(C4CollectionSpec const&, C4ReplicatorMode pushMode,
                                                C4ReplicatorMode pullMode);
 
+        bool removeCollection(C4CollectionSpec const&);
+
         fleece::MutableDict copyOptions() const;       ///< Returns copy of options (never null)
         void                setOptions(fleece::Dict);  ///< Updates options Dict
         void                updateOptions(std::function<void(fleece::MutableDict)> const& callback);

LiteCore/Database/LiveQuerier.cc

@@ -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); }

LiteCore/Database/SequenceTracker.cc

@@ -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); }
     }

LiteCore/Query/SQLiteQuery.cc

@@ -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)

LiteCore/Storage/DataFile.cc

@@ -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() {

Networking/BLIP/BLIPConnection.cc

@@ -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))
@@ -173,7 +172,6 @@ namespace litecore::blip {
                   _countOutboxDepth, _totalBytesWritten, _numRequestsReceived, _totalBytesRead, _timeOpen.elapsed(),
                   _maxOutboxDepth, outboxDepth);
             logStats();
-#endif
         }
 
         void onWebSocketGotTLSCertificate(slice certData) override {

Replicator/Worker.cc

@@ -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());
     }
 

Replicator/c4Replicator.cc

@@ -202,6 +202,18 @@ C4ReplicationCollection& C4Replicator::Parameters::addCollection(C4ReplicationCo
     return copiedSpec;
 }
 
+bool C4Replicator::Parameters::removeCollection(C4CollectionSpec const& spec) {
+    for ( auto i = _collections.begin(); i != _collections.end(); ++i ) {
+        if ( i->collection == spec ) {
+            _collections.erase(i);
+            this->C4ReplicatorParameters::collections = _collections.data();
+            collectionCount                           = _collections.size();
+            return true;
+        }
+    }
+    return false;
+}
+
 MutableDict C4Replicator::Parameters::copyOptions() const {
     if ( _options ) return Doc{_options}.asDict().mutableCopy();
     else