Skip to content

Commit

Permalink
Change to upstream 0.x spdlog branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Silarn committed Apr 6, 2019
1 parent 9d1c457 commit c09bb80
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
url = https://github.com/fmtlib/fmt.git
[submodule "spdlog"]
path = spdlog
url = https://github.com/TanninOne/spdlog.git
url = https://github.com/gabime/spdlog.git
2 changes: 1 addition & 1 deletion spdlog
Submodule spdlog updated 132 files
8 changes: 3 additions & 5 deletions src/shared/shmlogger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,13 @@ void spdlog::sinks::shm_sink::output(level::level_enum lev,
switch (lev) {
case level::trace:
case level::debug:
case level::notice: {
case level::info: {
// m_LogQueue.send(message.c_str(), count, 0);
sent = m_LogQueue.try_send(message.c_str(),
static_cast<unsigned int>(count), 0);
} break;
case level::alert:
case level::critical:
case level::emerg:
case level::err: {
case level::err:
case level::critical: {
m_LogQueue.send(message.c_str(), static_cast<unsigned int>(count), 0);
} break;
default: {
Expand Down
1 change: 1 addition & 0 deletions src/shared/shmlogger.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ along with usvfs. If not, see <http://www.gnu.org/licenses/>.
#include <boost/format.hpp>
#include <atomic>
#include <spdlog.h>
#include <fmt/ostr.h>
#include <cstdint>

typedef boost::interprocess::message_queue_t<usvfs::shared::VoidPointerT> message_queue_interop;
Expand Down
4 changes: 2 additions & 2 deletions src/usvfs_proxy/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ int main(int argc, char **argv) {
exceptionDialog(__LINE__, 2, e.what(), e2.what());
// no way to log this
} catch (const std::exception &) {
logger->critical() << e.what();
logger->critical(e.what());
}
return 1;
}
Expand Down Expand Up @@ -216,7 +216,7 @@ int main(int argc, char **argv) {
// no way to log this
exceptionDialog(__LINE__, 2, e.what(), e2.what());
} catch (const std::exception &) {
logger->critical() << e.what();
logger->critical(e.what());
}
}
}

0 comments on commit c09bb80

Please sign in to comment.