diff options
Diffstat (limited to 'cpp/src')
-rw-r--r-- | cpp/src/qpid/broker/NullMessageStore.cpp | 20 | ||||
-rwxr-xr-x | cpp/src/tests/stop_broker | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/cpp/src/qpid/broker/NullMessageStore.cpp b/cpp/src/qpid/broker/NullMessageStore.cpp index 4c1f98eb5a..35a2a45c1f 100644 --- a/cpp/src/qpid/broker/NullMessageStore.cpp +++ b/cpp/src/qpid/broker/NullMessageStore.cpp @@ -51,17 +51,17 @@ NullMessageStore::NullMessageStore(bool _warn) : warn(_warn){} void NullMessageStore::create(const PersistableQueue& queue) { - QPID_LOG(warning, "Can't create durable queue '" << queue.getName() << "'. Persistence not enabled."); + QPID_LOG(info, "Can't create durable queue '" << queue.getName() << "'. Persistence not enabled."); } void NullMessageStore::destroy(const PersistableQueue& queue) { - QPID_LOG(warning, "Can't destroy durable queue '" << queue.getName() << "'. Persistence not enabled."); + QPID_LOG(info, "Can't destroy durable queue '" << queue.getName() << "'. Persistence not enabled."); } void NullMessageStore::create(const PersistableExchange& exchange) { - QPID_LOG(warning, "Can't create durable exchange '" + QPID_LOG(info, "Can't create durable exchange '" << exchange.getName() << "'. Persistence not enabled."); } @@ -74,37 +74,37 @@ void NullMessageStore::unbind(const PersistableExchange&, const PersistableQueue void NullMessageStore::recover(RecoveryManager&) { - QPID_LOG(warning, "Persistence not enabled, no recovery attempted."); + QPID_LOG(info, "Persistence not enabled, no recovery attempted."); } void NullMessageStore::stage(PersistableMessage&) { - QPID_LOG(warning, "Can't stage message. Persistence not enabled."); + QPID_LOG(info, "Can't stage message. Persistence not enabled."); } void NullMessageStore::destroy(PersistableMessage&) { - QPID_LOG(warning, "No need to destroy staged message. Persistence not enabled."); + QPID_LOG(info, "No need to destroy staged message. Persistence not enabled."); } void NullMessageStore::appendContent(PersistableMessage&, const string&) { - QPID_LOG(warning, "Can't load content. Persistence not enabled."); + QPID_LOG(info, "Can't load content. Persistence not enabled."); } void NullMessageStore::loadContent(PersistableMessage&, string&, uint64_t, uint32_t) { - QPID_LOG(warning, "Can't load content. Persistence not enabled."); + QPID_LOG(info, "Can't load content. Persistence not enabled."); } void NullMessageStore::enqueue(TransactionContext*, PersistableMessage&, const PersistableQueue& queue) { - QPID_LOG(warning, "Can't enqueue message onto '" << queue.getName() << "'. Persistence not enabled."); + QPID_LOG(info, "Can't enqueue message onto '" << queue.getName() << "'. Persistence not enabled."); } void NullMessageStore::dequeue(TransactionContext*, PersistableMessage&, const PersistableQueue& queue) { - QPID_LOG(warning, "Can't dequeue message from '" << queue.getName() << "'. Persistence not enabled."); + QPID_LOG(info, "Can't dequeue message from '" << queue.getName() << "'. Persistence not enabled."); } std::auto_ptr<TransactionContext> NullMessageStore::begin() diff --git a/cpp/src/tests/stop_broker b/cpp/src/tests/stop_broker index ef2f8362f5..4f183d18f5 100755 --- a/cpp/src/tests/stop_broker +++ b/cpp/src/tests/stop_broker @@ -9,8 +9,8 @@ rm -f qpidd.port while ../qpidd --check >/dev/null 2>&1; do true; done # Check qpidd.log. -egrep 'warn|error|critical' qpidd.log && { - echo "Suspicious broker log entries in qpidd.log." +egrep 'warning|error|critical' qpidd.log && { + echo "Suspicious broker log entries in qpidd.log, above." ERROR=1 } |