Repository: nifi-minifi-cpp Updated Branches: refs/heads/master a2d9bfca8 -> 0af30b1e5
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/0af30b1e/libminifi/src/sitetosite/SiteToSiteClient.cpp ---------------------------------------------------------------------- diff --git a/libminifi/src/sitetosite/SiteToSiteClient.cpp b/libminifi/src/sitetosite/SiteToSiteClient.cpp index 7094fd3..1f98655 100644 --- a/libminifi/src/sitetosite/SiteToSiteClient.cpp +++ b/libminifi/src/sitetosite/SiteToSiteClient.cpp @@ -29,7 +29,7 @@ int SiteToSiteClient::writeRequestType(RequestType type) { if (type >= MAX_REQUEST_TYPE) return -1; - return peer_->writeUTF(RequestTypeStr[type]); + return peer_->writeUTF(SiteToSiteRequest::RequestTypeStr[type]); } int SiteToSiteClient::readRequestType(RequestType &type) { @@ -41,7 +41,7 @@ int SiteToSiteClient::readRequestType(RequestType &type) { return ret; for (int i = NEGOTIATE_FLOWFILE_CODEC; i <= SHUTDOWN; i++) { - if (RequestTypeStr[i] == requestTypeStr) { + if (SiteToSiteRequest::RequestTypeStr[i] == requestTypeStr) { type = (RequestType) i; return ret; } @@ -99,7 +99,7 @@ void SiteToSiteClient::deleteTransaction(std::string transactionID) { transaction = it->second; } - logger_->log_info("Site2Site delete transaction %s", transaction->getUUIDStr().c_str()); + logger_->log_debug("Site2Site delete transaction %s", transaction->getUUIDStr().c_str()); known_transactions_.erase(transactionID); } @@ -135,7 +135,7 @@ int SiteToSiteClient::writeResponse(const std::shared_ptr<Transaction> &transact void SiteToSiteClient::tearDown() { if (peer_state_ >= ESTABLISHED) { - logger_->log_info("Site2Site Protocol tearDown"); + logger_->log_debug("Site2Site Protocol tearDown"); // need to write shutdown request writeRequestType(SHUTDOWN); } @@ -188,7 +188,7 @@ bool SiteToSiteClient::transferFlowFiles(const std::shared_ptr<core::ProcessCont throw Exception(SITE2SITE_EXCEPTION, "Send Failed"); } - logger_->log_info("Site2Site transaction %s send flow record %s", transactionID.c_str(), flow->getUUIDStr().c_str()); + logger_->log_debug("Site2Site transaction %s send flow record %s", transactionID.c_str(), flow->getUUIDStr().c_str()); if (resp == 0) { uint64_t endTime = getTimeMillis(); std::string transitUri = peer_->getURL() + "/" + flow->getUUIDStr(); @@ -218,7 +218,7 @@ bool SiteToSiteClient::transferFlowFiles(const std::shared_ptr<core::ProcessCont ss << "Complete Failed for " << transactionID; throw Exception(SITE2SITE_EXCEPTION, ss.str().c_str()); } - logger_->log_info("Site2Site transaction %s successfully send flow record %d, content bytes %d", transactionID.c_str(), transaction->total_transfers_, transaction->_bytes); + logger_->log_debug("Site2Site transaction %s successfully send flow record %d, content bytes %llu", transactionID.c_str(), transaction->total_transfers_, transaction->_bytes); } catch (std::exception &exception) { if (transaction) deleteTransaction(transactionID); @@ -280,7 +280,7 @@ bool SiteToSiteClient::confirm(std::string transactionID) { // time window involved in the entire transaction, it is reduced to a simple round-trip conversation. int64_t crcValue = transaction->getCRC(); std::string crc = std::to_string(crcValue); - logger_->log_info("Site2Site Send confirm with CRC %d to transaction %s", transaction->getCRC(), transactionID.c_str()); + logger_->log_debug("Site2Site Send confirm with CRC %d to transaction %s", transaction->getCRC(), transactionID.c_str()); ret = writeResponse(transaction, CONFIRM_TRANSACTION, crc); if (ret <= 0) return false; @@ -291,18 +291,18 @@ bool SiteToSiteClient::confirm(std::string transactionID) { return false; if (code == CONFIRM_TRANSACTION) { - logger_->log_info("Site2Site transaction %s peer confirm transaction", transactionID.c_str()); + logger_->log_debug("Site2Site transaction %s peer confirm transaction", transactionID.c_str()); transaction->_state = TRANSACTION_CONFIRMED; return true; } else if (code == BAD_CHECKSUM) { - logger_->log_info("Site2Site transaction %s peer indicate bad checksum", transactionID.c_str()); + logger_->log_debug("Site2Site transaction %s peer indicate bad checksum", transactionID.c_str()); return false; } else { - logger_->log_info("Site2Site transaction %s peer unknown respond code %d", transactionID.c_str(), code); + logger_->log_debug("Site2Site transaction %s peer unknown respond code %d", transactionID.c_str(), code); return false; } } else { - logger_->log_info("Site2Site Send FINISH TRANSACTION for transaction %s", transactionID.c_str()); + logger_->log_debug("Site2Site Send FINISH TRANSACTION for transaction %s", transactionID.c_str()); ret = writeResponse(transaction, FINISH_TRANSACTION, "FINISH_TRANSACTION"); if (ret <= 0) return false; @@ -312,19 +312,19 @@ bool SiteToSiteClient::confirm(std::string transactionID) { // we've sent a FINISH_TRANSACTION. Now we'll wait for the peer to send a 'Confirm Transaction' response if (code == CONFIRM_TRANSACTION) { - logger_->log_info("Site2Site transaction %s peer confirm transaction with CRC %s", transactionID.c_str(), message.c_str()); + logger_->log_debug("Site2Site transaction %s peer confirm transaction with CRC %s", transactionID.c_str(), message.c_str()); if (this->_currentVersion > 3) { int64_t crcValue = transaction->getCRC(); std::string crc = std::to_string(crcValue); if (message == crc) { - logger_->log_info("Site2Site transaction %s CRC matched", transactionID.c_str()); + logger_->log_debug("Site2Site transaction %s CRC matched", transactionID.c_str()); ret = writeResponse(transaction, CONFIRM_TRANSACTION, "CONFIRM_TRANSACTION"); if (ret <= 0) return false; transaction->_state = TRANSACTION_CONFIRMED; return true; } else { - logger_->log_info("Site2Site transaction %s CRC not matched %s", transactionID.c_str(), crc.c_str()); + logger_->log_debug("Site2Site transaction %s CRC not matched %s", transactionID.c_str(), crc.c_str()); ret = writeResponse(transaction, BAD_CHECKSUM, "BAD_CHECKSUM"); return false; } @@ -335,7 +335,7 @@ bool SiteToSiteClient::confirm(std::string transactionID) { transaction->_state = TRANSACTION_CONFIRMED; return true; } else { - logger_->log_info("Site2Site transaction %s peer unknown respond code %d", transactionID.c_str(), code); + logger_->log_debug("Site2Site transaction %s peer unknown respond code %d", transactionID.c_str(), code); return false; } return false; @@ -413,7 +413,7 @@ bool SiteToSiteClient::complete(std::string transactionID) { transaction->_state = TRANSACTION_COMPLETED; return true; } else { - logger_->log_info("Site2Site transaction %s send finished", transactionID.c_str()); + logger_->log_debug("Site2Site transaction %s send finished", transactionID.c_str()); ret = this->writeResponse(transaction, TRANSACTION_FINISHED, "Finished"); if (ret <= 0) { return false; @@ -433,11 +433,11 @@ bool SiteToSiteClient::complete(std::string transactionID) { return false; if (code == TRANSACTION_FINISHED) { - logger_->log_info("Site2Site transaction %s peer finished transaction", transactionID.c_str()); + logger_->log_debug("Site2Site transaction %s peer finished transaction", transactionID.c_str()); transaction->_state = TRANSACTION_COMPLETED; return true; } else { - logger_->log_info("Site2Site transaction %s peer unknown respond code %d", transactionID.c_str(), code); + logger_->log_debug("Site2Site transaction %s peer unknown respond code %d", transactionID.c_str(), code); return false; } } @@ -448,7 +448,7 @@ int16_t SiteToSiteClient::send(std::string transactionID, DataPacket *packet, co std::shared_ptr<Transaction> transaction = NULL; if (flowFile && !flowFile->getResourceClaim()->exists()) { - logger_->log_info("Claim %s does not exist for FlowFile %s", flowFile->getResourceClaim()->getContentFullPath(), flowFile->getUUIDStr()); + logger_->log_debug("Claim %s does not exist for FlowFile %s", flowFile->getResourceClaim()->getContentFullPath(), flowFile->getUUIDStr()); return -2; } if (peer_state_ != READY) { @@ -467,12 +467,12 @@ int16_t SiteToSiteClient::send(std::string transactionID, DataPacket *packet, co } if (transaction->getState() != TRANSACTION_STARTED && transaction->getState() != DATA_EXCHANGED) { - logger_->log_info("Site2Site transaction %s is not at started or exchanged state", transactionID.c_str()); + logger_->log_debug("Site2Site transaction %s is not at started or exchanged state", transactionID.c_str()); return -1; } if (transaction->getDirection() != SEND) { - logger_->log_info("Site2Site transaction %s direction is wrong", transactionID.c_str()); + logger_->log_debug("Site2Site transaction %s direction is wrong", transactionID.c_str()); return -1; } @@ -500,7 +500,7 @@ int16_t SiteToSiteClient::send(std::string transactionID, DataPacket *packet, co if (ret <= 0) { return -1; } - logger_->log_info("Site2Site transaction %s send attribute key %s value %s", transactionID.c_str(), itAttribute->first.c_str(), itAttribute->second.c_str()); + logger_->log_debug("Site2Site transaction %s send attribute key %s value %s", transactionID.c_str(), itAttribute->first.c_str(), itAttribute->second.c_str()); } uint64_t len = 0; @@ -508,14 +508,14 @@ int16_t SiteToSiteClient::send(std::string transactionID, DataPacket *packet, co len = flowFile->getSize(); ret = transaction->getStream().write(len); if (ret != 8) { - logger_->log_info("ret != 8"); + logger_->log_debug("ret != 8"); return -1; } if (flowFile->getSize() > 0) { sitetosite::ReadCallback callback(packet); session->read(flowFile, &callback); if (flowFile->getSize() != packet->_size) { - logger_->log_info("MisMatched sizes %d %d", flowFile->getSize(), packet->_size); + logger_->log_debug("MisMatched sizes %llu %llu", flowFile->getSize(), packet->_size); return -2; } } @@ -535,7 +535,7 @@ int16_t SiteToSiteClient::send(std::string transactionID, DataPacket *packet, co ret = transaction->getStream().writeData(reinterpret_cast<uint8_t *>(const_cast<char*>(packet->payload_.c_str())), len); if (ret != (int64_t)len) { - logger_->log_info("ret != len"); + logger_->log_debug("ret != len"); return -1; } packet->_size += len; @@ -545,7 +545,7 @@ int16_t SiteToSiteClient::send(std::string transactionID, DataPacket *packet, co transaction->total_transfers_++; transaction->_state = DATA_EXCHANGED; transaction->_bytes += len; - logger_->log_info("Site2Site transaction %s send flow record %d, total length %d, added %d", transactionID.c_str(), transaction->total_transfers_, transaction->_bytes, len); + logger_->log_debug("Site2Site transaction %s send flow record %d, total length %llu, added %llu", transactionID.c_str(), transaction->total_transfers_, transaction->_bytes, len); return 0; } @@ -571,12 +571,12 @@ bool SiteToSiteClient::receive(std::string transactionID, DataPacket *packet, bo } if (transaction->getState() != TRANSACTION_STARTED && transaction->getState() != DATA_EXCHANGED) { - logger_->log_info("Site2Site transaction %s is not at started or exchanged state", transactionID.c_str()); + logger_->log_debug("Site2Site transaction %s is not at started or exchanged state", transactionID.c_str()); return false; } if (transaction->getDirection() != RECEIVE) { - logger_->log_info("Site2Site transaction %s direction is wrong", transactionID.c_str()); + logger_->log_debug("Site2Site transaction %s direction is wrong", transactionID.c_str()); return false; } @@ -596,21 +596,21 @@ bool SiteToSiteClient::receive(std::string transactionID, DataPacket *packet, bo return false; } if (code == CONTINUE_TRANSACTION) { - logger_->log_info("Site2Site transaction %s peer indicate continue transaction", transactionID.c_str()); + logger_->log_debug("Site2Site transaction %s peer indicate continue transaction", transactionID.c_str()); transaction->_dataAvailable = true; } else if (code == FINISH_TRANSACTION) { - logger_->log_info("Site2Site transaction %s peer indicate finish transaction", transactionID.c_str()); + logger_->log_debug("Site2Site transaction %s peer indicate finish transaction", transactionID.c_str()); transaction->_dataAvailable = false; eof = true; return true; } else { - logger_->log_info("Site2Site transaction %s peer indicate wrong respond code %d", transactionID.c_str(), code); + logger_->log_debug("Site2Site transaction %s peer indicate wrong respond code %d", transactionID.c_str(), code); return false; } } if (!transaction->isDataAvailable()) { - logger_->log_info("No data is available"); + logger_->log_debug("No data is available"); eof = true; return true; } @@ -618,13 +618,12 @@ bool SiteToSiteClient::receive(std::string transactionID, DataPacket *packet, bo // start to read the packet uint32_t numAttributes; ret = transaction->getStream().read(numAttributes); - logger_->log_info("returning true/false because ret is %d %d", ret, numAttributes); if (ret <= 0 || numAttributes > MAX_NUM_ATTRIBUTES) { return false; } // read the attributes - logger_->log_info("Site2Site transaction %s receives attribute key %llu", transactionID.c_str(), numAttributes); + logger_->log_debug("Site2Site transaction %s receives attribute key %d", transactionID.c_str(), numAttributes); for (unsigned int i = 0; i < numAttributes; i++) { std::string key; std::string value; @@ -637,7 +636,7 @@ bool SiteToSiteClient::receive(std::string transactionID, DataPacket *packet, bo return false; } packet->_attributes[key] = value; - logger_->log_info("Site2Site transaction %s receives attribute key %s value %s", transactionID.c_str(), key.c_str(), value.c_str()); + logger_->log_debug("Site2Site transaction %s receives attribute key %s value %s", transactionID.c_str(), key.c_str(), value.c_str()); } uint64_t len; @@ -651,14 +650,14 @@ bool SiteToSiteClient::receive(std::string transactionID, DataPacket *packet, bo transaction->current_transfers_++; transaction->total_transfers_++; } else { - logger_->log_info("Site2Site transaction %s receives attribute ?", transactionID); + logger_->log_debug("Site2Site transaction %s receives attribute ?", transactionID); transaction->_dataAvailable = false; eof = true; return true; } transaction->_state = DATA_EXCHANGED; transaction->_bytes += len; - logger_->log_info("Site2Site transaction %s receives flow record %d, total length %d, added %d", transactionID.c_str(), transaction->total_transfers_, transaction->_bytes, len); + logger_->log_debug("Site2Site transaction %s receives flow record %d, total length %llu, added %llu", transactionID.c_str(), transaction->total_transfers_, transaction->_bytes, len); return true; } @@ -726,7 +725,7 @@ bool SiteToSiteClient::receiveFlowFiles(const std::shared_ptr<core::ProcessConte message << "Receive size not correct, expected to send " << flowFile->getSize() << " bytes, but actually sent " << packet._size; throw Exception(SITE2SITE_EXCEPTION, message.str().c_str()); } else { - logger_->log_info("received %d with expected %d", flowFile->getSize(), packet._size); + logger_->log_debug("received %llu with expected %llu", flowFile->getSize(), packet._size); } } core::Relationship relation; // undefined relationship @@ -748,7 +747,7 @@ bool SiteToSiteClient::receiveFlowFiles(const std::shared_ptr<core::ProcessConte transaction_str << "Complete Transaction " << transactionID << " Failed"; throw Exception(SITE2SITE_EXCEPTION, transaction_str.str().c_str()); } - logger_->log_info("Site2Site transaction %s successfully receive flow record %d, content bytes %d", transactionID.c_str(), transfers, bytes); + logger_->log_info("Site2Site transaction %s successfully receive flow record %d, content bytes %llu", transactionID.c_str(), transfers, bytes); // we yield the receive if we did not get anything if (transfers == 0) context->yield(); http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/0af30b1e/libminifi/src/utils/Id.cpp ---------------------------------------------------------------------- diff --git a/libminifi/src/utils/Id.cpp b/libminifi/src/utils/Id.cpp index 0c76a79..05e55a2 100644 --- a/libminifi/src/utils/Id.cpp +++ b/libminifi/src/utils/Id.cpp @@ -26,7 +26,6 @@ #include <cmath> #include <memory> #include <string> - #include "core/logging/LoggerConfiguration.h" #include "utils/StringUtils.h" @@ -50,20 +49,20 @@ IdGenerator::IdGenerator() uint64_t IdGenerator::getDeviceSegmentFromString(const std::string& str, int numBits) { uint64_t deviceSegment = 0; - for (int i = 0; i < str.length(); i++) { + for (size_t i = 0; i < str.length(); i++) { unsigned char c = toupper(str[i]); if (c >= '0' && c <= '9') { deviceSegment = deviceSegment + (c - '0'); } else if (c >= 'A' && c <= 'F') { deviceSegment = deviceSegment + (c - 'A' + 10); } else { - logger_->log_error("Expected hex char (0-9, A-F). Got %c.", c); + logging::LOG_ERROR(logger_) << "Expected hex char (0-9, A-F). Got " << c; } deviceSegment = deviceSegment << 4; } deviceSegment <<= 64 - (4 * (str.length() + 1)); deviceSegment >>= 64 - numBits; - logger_->log_debug("Using user defined device segment: %" PRIx64, deviceSegment); + logging::LOG_DEBUG(logger_) << "Using user defined device segment: " << std::hex << deviceSegment; deviceSegment <<= 64 - numBits; return deviceSegment; } @@ -79,7 +78,7 @@ uint64_t IdGenerator::getRandomDeviceSegment(int numBits) { } } deviceSegment >>= 64 - numBits; - logger_->log_debug("Using random device segment: %" PRIx64, deviceSegment); + logging::LOG_DEBUG(logger_) << "Using random defined device segment:" << deviceSegment; deviceSegment <<= 64 - numBits; return deviceSegment; } @@ -90,13 +89,13 @@ void IdGenerator::initialize(const std::shared_ptr<Properties> & properties) { if (properties->get("uid.implementation", implementation_str)) { std::transform(implementation_str.begin(), implementation_str.end(), implementation_str.begin(), ::tolower); if ("random" == implementation_str) { - logger_->log_debug("Using uuid_generate_random for uids."); + logging::LOG_DEBUG(logger_) << "Using uuid_generate_random for uids."; implementation_ = UUID_RANDOM_IMPL; } else if ("uuid_default" == implementation_str) { - logger_->log_debug("Using uuid_generate for uids."); + logging::LOG_DEBUG(logger_) << "Using uuid_generate for uids."; implementation_ = UUID_DEFAULT_IMPL; } else if ("minifi_uid" == implementation_str) { - logger_->log_debug("Using minifi uid implementation for uids"); + logging::LOG_DEBUG(logger_) << "Using minifi uid implementation for uids"; implementation_ = MINIFI_UID_IMPL; uint64_t timestamp = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(); @@ -107,13 +106,13 @@ void IdGenerator::initialize(const std::shared_ptr<Properties> & properties) { if (properties->get("uid.minifi.device.segment", device_segment)) { prefix = getDeviceSegmentFromString(device_segment, device_bits); } else { - logger_->log_warn("uid.minifi.device.segment not specified, generating random device segment"); + logging::LOG_WARN(logger_) << "uid.minifi.device.segment not specified, generating random device segment"; prefix = getRandomDeviceSegment(device_bits); } timestamp <<= device_bits; timestamp >>= device_bits; prefix = prefix + timestamp; - logger_->log_debug("Using minifi uid prefix: %16" PRIx64, prefix); + logging::LOG_DEBUG(logger_) << "Using minifi uid prefix: " << std::hex << prefix; } for (int i = 0; i < 8; i++) { unsigned char prefix_element = (prefix >> ((7 - i) * 8)) & UNSIGNED_CHAR_MAX; @@ -121,12 +120,12 @@ void IdGenerator::initialize(const std::shared_ptr<Properties> & properties) { } incrementor_ = 0; } else if ("time" == implementation_str) { - logger_->log_debug("Using uuid_generate_time implementation for uids."); + logging::LOG_DEBUG(logger_) << "Using uuid_generate_time implementation for uids."; } else { - logger_->log_debug("Invalid value for uid.implementation (%s). Using uuid_generate_time implementation for uids.", implementation_str); + logging::LOG_DEBUG(logger_) << "Invalid value for uid.implementation (" << implementation_str << "). Using uuid_generate_time implementation for uids."; } } else { - logger_->log_debug("Using uuid_generate_time implementation for uids."); + logging::LOG_DEBUG(logger_) << "Using uuid_generate_time implementation for uids."; } } http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/0af30b1e/libminifi/test/curl-tests/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/libminifi/test/curl-tests/CMakeLists.txt b/libminifi/test/curl-tests/CMakeLists.txt index ff68b8e..b645da1 100644 --- a/libminifi/test/curl-tests/CMakeLists.txt +++ b/libminifi/test/curl-tests/CMakeLists.txt @@ -73,4 +73,4 @@ add_test(NAME C2VerifyServeResults COMMAND C2VerifyServeResults "${TEST_RESOURCE add_test(NAME C2VerifyHeartbeatAndStop COMMAND C2VerifyHeartbeatAndStop "${TEST_RESOURCES}/C2VerifyHeartbeatAndStop.yml" "${TEST_RESOURCES}/") add_test(NAME SiteToSiteRestTest COMMAND SiteToSiteRestTest "${TEST_RESOURCES}/TestSite2SiteRest.yml" "${TEST_RESOURCES}/" "http://localhost:8077/nifi-api/site-to-site";) add_test(NAME ControllerServiceIntegrationTests COMMAND ControllerServiceIntegrationTests "${TEST_RESOURCES}/TestControllerServices.yml" "${TEST_RESOURCES}/") -add_test(NAME ThreadPoolAdjust COMMAND ThreadPoolAdjust "${TEST_RESOURCES}/TestHTTPPostChunkedEncoding.yml" "${TEST_RESOURCES}/") +add_test(NAME ThreadPoolAdjust COMMAND ThreadPoolAdjust "${TEST_RESOURCES}/ThreadPoolAdjust.yml" "${TEST_RESOURCES}/") http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/0af30b1e/libminifi/test/resources/ThreadPoolAdjust.yml ---------------------------------------------------------------------- diff --git a/libminifi/test/resources/ThreadPoolAdjust.yml b/libminifi/test/resources/ThreadPoolAdjust.yml index 8b3c989..602f26f 100644 --- a/libminifi/test/resources/ThreadPoolAdjust.yml +++ b/libminifi/test/resources/ThreadPoolAdjust.yml @@ -43,7 +43,7 @@ Processors: auto-terminated relationships list: Properties: Base Path: urlofchampions - Listening Port: 10016 + Listening Port: 10099 - name: Invoke id: 2438e3c8-015a-1000-79ca-83af40ec1992 class: org.apache.nifi.processors.standard.InvokeHTTP @@ -59,7 +59,7 @@ Processors: HTTP Method: POST Use Chunked Encoding: true Content-type: text/html - Remote URL: http://localhost:10016/urlofchampions + Remote URL: http://localhost:10099/urlofchampions - name: Loggit id: 2438e3c8-015a-1000-79ca-83af40ec1993 class: org.apache.nifi.processors.standard.LogAttribute http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/0af30b1e/libminifi/test/unit/IdTests.cpp ---------------------------------------------------------------------- diff --git a/libminifi/test/unit/IdTests.cpp b/libminifi/test/unit/IdTests.cpp index fb30835..c60aedb 100644 --- a/libminifi/test/unit/IdTests.cpp +++ b/libminifi/test/unit/IdTests.cpp @@ -168,6 +168,6 @@ TEST_CASE("Test Hex Device Segment 18 bits", "[id]") { REQUIRE(128 == (uid[2] & 192)); REQUIRE(1 == uid[15]); - REQUIRE(true == LogTestController::getInstance().contains("Using minifi uid prefix: 9af8")); + REQUIRE(true == LogTestController::getInstance().contains("Using minifi uid prefix: 9af8")); LogTestController::getInstance().reset(); }
