diff options
7 files changed, 10 insertions, 10 deletions
diff --git a/filedistribution/src/vespa/filedistribution/common/vespa_logfwd.cpp b/filedistribution/src/vespa/filedistribution/common/vespa_logfwd.cpp index ab2a2334434..c45fbb84e56 100644 --- a/filedistribution/src/vespa/filedistribution/common/vespa_logfwd.cpp +++ b/filedistribution/src/vespa/filedistribution/common/vespa_logfwd.cpp @@ -42,6 +42,6 @@ void filedistribution::logfwd::log(LogLevel level, const char* file, int line, c vsnprintf(payload.get(), maxSize, fmt, args); va_end(args); - logger.doLog(vespaLogLevel, file, line, payload.get()); + logger.doLog(vespaLogLevel, file, line, "%s", payload.get()); } } diff --git a/searchlib/src/vespa/searchlib/predicate/simple_index.cpp b/searchlib/src/vespa/searchlib/predicate/simple_index.cpp index 98bf03c1e7c..a0051855c6a 100644 --- a/searchlib/src/vespa/searchlib/predicate/simple_index.cpp +++ b/searchlib/src/vespa/searchlib/predicate/simple_index.cpp @@ -14,7 +14,7 @@ bool log_enabled() { } void log_debug(vespalib::string &str) { - LOG(debug, str.c_str()); + LOG(debug, "%s", str.c_str()); } } // namespace simpleindex diff --git a/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.cpp b/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.cpp index 74dac0c016c..bc78f3786f6 100644 --- a/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.cpp +++ b/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.cpp @@ -507,7 +507,7 @@ StorageBucketDBInitializer::onDown( std::ostringstream ost; ost << "Cannot perform operation " << msg->getType() << " now because " << "we are still listing buckets from disk."; - LOGBP(warning, ost.str().c_str()); + LOGBP(warning, "%s", ost.str().c_str()); std::unique_ptr<api::StorageReply> reply( static_cast<api::StorageCommand&>(*msg).makeReply()); reply->setResult(api::ReturnCode(api::ReturnCode::ABORTED, ost.str())); diff --git a/storage/src/vespa/storage/common/storagelink.cpp b/storage/src/vespa/storage/common/storagelink.cpp index 3a48573c4ce..23fbf477fd2 100644 --- a/storage/src/vespa/storage/common/storagelink.cpp +++ b/storage/src/vespa/storage/common/storagelink.cpp @@ -163,7 +163,7 @@ void StorageLink::sendDown(const StorageMessage::SP& msg) << vespalib::getStackTrace(0); if (!msg->getType().isReply()) { //if (!_closed) { - LOGBP(warning, ost.str().c_str()); + LOGBP(warning, "%s", ost.str().c_str()); //} StorageCommand& cmd = static_cast<StorageCommand&>(*msg); shared_ptr<StorageReply> reply(cmd.makeReply().release()); @@ -177,7 +177,7 @@ void StorageLink::sendDown(const StorageMessage::SP& msg) ost << " Return code: " << static_cast<StorageReply&>(*msg).getResult(); //if (!_closed) { - LOGBP(warning, ost.str().c_str()); + LOGBP(warning, "%s", ost.str().c_str()); //} } //} @@ -225,7 +225,7 @@ void StorageLink::sendUp(const shared_ptr<StorageMessage> & msg) ost << vespalib::getStackTrace(0); if (!msg->getType().isReply()) { //if (!_closed) { - LOGBP(warning, ost.str().c_str()); + LOGBP(warning, "%s", ost.str().c_str()); //} StorageCommand& cmd = static_cast<StorageCommand&>(*msg); shared_ptr<StorageReply> reply(cmd.makeReply().release()); @@ -239,7 +239,7 @@ void StorageLink::sendUp(const shared_ptr<StorageMessage> & msg) ost << " Return code: " << static_cast<StorageReply&>(*msg).getResult(); //if (!_closed) { - LOGBP(warning, ost.str().c_str()); + LOGBP(warning, "%s", ost.str().c_str()); //} } //} diff --git a/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp b/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp index ee10584ce69..50f9a37e55e 100644 --- a/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp +++ b/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp @@ -171,7 +171,7 @@ namespace { } else if (state != DeadLockDetector::OK) { vespalib::asciistream ost; ost << "Thread " << id << " has registered tick again.\n"; - LOGBT(info, "%s", ost.str().c_str()); + LOGBP(info, "%s", ost.str().c_str()); state = DeadLockDetector::OK; } } diff --git a/storage/src/vespa/storage/persistence/mergehandler.cpp b/storage/src/vespa/storage/persistence/mergehandler.cpp index bd5b4febf18..3e0aa0fe4b9 100644 --- a/storage/src/vespa/storage/persistence/mergehandler.cpp +++ b/storage/src/vespa/storage/persistence/mergehandler.cpp @@ -987,7 +987,7 @@ MergeHandler::handleMergeBucket(api::MergeBucketCommand& cmd, if (_env._fileStorHandler.isMerging(id)) { const char* err = "A merge is already running on this bucket."; - LOG(debug, err); + LOG(debug, "%s", err); tracker->fail(ReturnCode::BUSY, err); return tracker; } diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.cpp b/storage/src/vespa/storage/storageserver/communicationmanager.cpp index 21c1e68cbcc..a2eb5bf5edd 100644 --- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp +++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp @@ -498,7 +498,7 @@ CommunicationManager::enqueue(const std::shared_ptr<api::StorageMessage> & msg) ost << "Failed to aquire " << (memoryFootprint * 2) << " bytes of memory to handle command of type " << msg->getType() << "\n"; - LOG(spam, ost.str().c_str()); + LOG(spam, "%s", ost.str().c_str()); api::StorageCommand* cmd(dynamic_cast<api::StorageCommand*>(msg.get())); if (cmd) { |