diff --git a/src/chat/distributedchat.cc b/src/chat/distributedchat.cc index f932ec0f6..716c47647 100644 --- a/src/chat/distributedchat.cc +++ b/src/chat/distributedchat.cc @@ -68,14 +68,14 @@ static const uint32_t MAX_MESSAGES_PER_SECONDS_PERIOD = 10 ; // duration // identity starts, then one summary line per identity per REPORT_INTERVAL carrying the number of // items dropped in between. No error is hidden: signature mismatches and other genuine problems are // logged separately and unconditionally. +// +// No mutex: both callers sit in the chat item receiving path (p3ChatService::receiveChatQueue -> +// handleRecvItem), which runs in a single thread. static void logBannedIdentityDrop(const RsGxsId& keyId) { static const rstime_t REPORT_INTERVAL = 60; // seconds - static RsMutex banned_drop_log_mtx("bannedDropLog"); static std::map > stats; // id -> (drops since last report, last report time) - RS_STACK_MUTEX(banned_drop_log_mtx); - rstime_t now = time(nullptr); auto it = stats.find(keyId); diff --git a/src/gxs/rsgxsnetservice.cc b/src/gxs/rsgxsnetservice.cc index dd6bb2357..d58722a2e 100644 --- a/src/gxs/rsgxsnetservice.cc +++ b/src/gxs/rsgxsnetservice.cc @@ -3749,10 +3749,7 @@ bool RsGxsNetService::encryptSingleNxsItem(RsNxsItem *item, const RsGxsCircleId& if(!mCircles->recipients(destination_circle,destination_group,recipients)) { - // Not an error: the circle membership may simply not be cached yet. The caller retries later. -#ifdef NXS_NET_DEBUG_7 - GXSNETDEBUG_P_(item->PeerId()) << " Cannot encrypt transaction yet: recipients list not available for circle " << destination_circle << ". Will re-try later." << std::endl; -#endif + RsWarn() << "Cannot encrypt transaction: recipients list not available for circle " << destination_circle << ". Will re-try later." ; status = RS_NXS_ITEM_ENCRYPTION_STATUS_CIRCLE_ERROR ; return false ; } diff --git a/src/pqi/pqissllistener.cc b/src/pqi/pqissllistener.cc index 1a4f74e27..d6d861182 100644 --- a/src/pqi/pqissllistener.cc +++ b/src/pqi/pqissllistener.cc @@ -878,6 +878,8 @@ int pqissllistener::finaliseConnection(int fd, SSL *ssl, const RsPeerId& peerId, "pqissllistener::finaliseConnection() matched peer " + peerId.toStdString() + " from " + sockaddr_storage_tostring(remote_addr) + " => handing to pqissl"); + std::cerr << "pqissllistenner::finaliseConnection() connected to " << sockaddr_storage_tostring(remote_addr) << std::endl; + // hand off ssl conection. pqissl *pqis = it -> second; pqis -> accept(ssl, fd, remote_addr);