diff --git a/src/lib/logging/MsgPacking.h b/src/lib/logging/MsgPacking.h index b140b8635..97dbe2dd6 100644 --- a/src/lib/logging/MsgPacking.h +++ b/src/lib/logging/MsgPacking.h @@ -41,9 +41,19 @@ std::string unpack_msg_args(std::array const&buffer, const char*msg_ return result; } +template struct CheckPtr { + const static auto value = true; +}; + +template +struct CheckPtr : public CheckPtr { + static_assert(!std::is_pointer::value,"Pointers cannot be logged"); +}; + template void pack_msg_args(std::array &buffer,Args&&...args) { using Store = std::tuple::type...>; + static_assert(CheckPtr::value,"Illegal type logged"); if(sizeof(Store) <= SZ) new (&buffer[0]) Store(std::forward(args)...); else { diff --git a/src/lib/md/MDConsumer.cpp b/src/lib/md/MDConsumer.cpp index a90f44eb8..041a82490 100644 --- a/src/lib/md/MDConsumer.cpp +++ b/src/lib/md/MDConsumer.cpp @@ -140,7 +140,7 @@ public: "Waited far too long for key: {} security discovery may be hung." " symbol: {} type: {}", key, - (*ppcold)->security.symbol(), + std::string((*ppcold)->security.symbol()), SecurityType_Name((*ppcold)->security.type)); return false; } diff --git a/src/lib/utils/Dispatcher.cpp b/src/lib/utils/Dispatcher.cpp index ade6a1a48..f50972c37 100755 --- a/src/lib/utils/Dispatcher.cpp +++ b/src/lib/utils/Dispatcher.cpp @@ -165,7 +165,7 @@ Dispatcher& Dispatcher::create_new(const char* name) { temp.run(); } catch(const std::exception& ex) { - LOG(Gen,Error ,"Exception on dispatcher thread: {}" ,ex.what()); + LOG(Gen,Error ,"Exception on dispatcher thread: {}" ,std::string(ex.what())); bts_assert_msg(false, ex.what()); } }); diff --git a/src/server/sparkd/jetfix/connection/SocketConnection.cpp b/src/server/sparkd/jetfix/connection/SocketConnection.cpp index 7060cfe63..7cd314ebc 100644 --- a/src/server/sparkd/jetfix/connection/SocketConnection.cpp +++ b/src/server/sparkd/jetfix/connection/SocketConnection.cpp @@ -38,7 +38,7 @@ bool SocketConnection::connect () LOG (Jetfix,Error, "Failed to allocate socket when connecting to {}:{} errno:{} msg: {}", _cfg.socket_connect_host_ip (), _cfg.socket_connect_port (), - er, strerror_r(er,msg,sizeof(msg))); + er, std::string(strerror_r(er,msg,sizeof(msg)))); _fd = -1; return false; } @@ -93,7 +93,7 @@ int SocketConnection::read (char* to_buffer,size_t read_count) auto er = errno; char msg [256]; LOG (Jetfix,Warn,"Could not read from jetfix connection. {}", - strerror_r(er,msg,sizeof(msg))); + std::string(strerror_r(er,msg,sizeof(msg)))); } return result; } @@ -120,7 +120,7 @@ int SocketConnection::write (WriteVec const&vec,size_t vec_size,size_t cid) auto er = errno; char msg [256]; LOG (Jetfix,Warn,"Could not write to jetfix connection. ", - strerror_r(er,msg,sizeof(msg))); + std::string(strerror_r(er,msg,sizeof(msg)))); } return result; } diff --git a/src/server/sparkd/jetfix/gateway/CoreGateway.cpp b/src/server/sparkd/jetfix/gateway/CoreGateway.cpp index 2503eb8e1..de1649aa7 100644 --- a/src/server/sparkd/jetfix/gateway/CoreGateway.cpp +++ b/src/server/sparkd/jetfix/gateway/CoreGateway.cpp @@ -491,8 +491,8 @@ void CoreGateway::transition (State new_state) { LOG (Jetfix,Warn,"Transitioning Jetfix gateway {} from {} to {}", me->cfg.name (), - state_name (me->state), - state_name (new_state)); + std::string(state_name (me->state)), + std::string(state_name (new_state))); me->state = new_state; check_state_invariants (); } diff --git a/src/server/sparkd/jetfix/gateway/Session.cpp b/src/server/sparkd/jetfix/gateway/Session.cpp index aaf063e51..5be6be05e 100644 --- a/src/server/sparkd/jetfix/gateway/Session.cpp +++ b/src/server/sparkd/jetfix/gateway/Session.cpp @@ -141,7 +141,7 @@ void Session::receive (InMsgBuffer const&msg) { LOG (Jetfix,Error, "Discarding repeated message: {} sn: {} state: {} conn: {}", (char) msg.type (), msg.get_seq_num (), - state_name (me->state), me->cfg.name ()); + std::string(state_name (me->state)), me->cfg.name ()); return; } @@ -569,7 +569,7 @@ void Session::logout (JetFIXError::Code error,std::string const &extra_info) level = Info; LOG (Jetfix,level,"Logging out of jetfix session: {} {} conn: {}", - JetFIXError::code_msg (error), extra_info, me->cfg.name ()); + std::string(JetFIXError::code_msg (error)), extra_info, me->cfg.name ()); me->start_of_logout = me->now (); internal_send (make_logout (me->cfg)); @@ -590,7 +590,7 @@ void Session::terminate_session (JetFIXError::Code error,std::string const&extra level = Info; LOG (Jetfix,level,"Jetfix session disconnected: {} {} conn: {}", - JetFIXError::code_msg (error), extra_info, me->cfg.name ()); + std::string(JetFIXError::code_msg (error)), extra_info, me->cfg.name ()); transition (State::TERMINATED); me->event_sink.session_terminated (); @@ -677,7 +677,9 @@ bool Session::resend_request_active () void Session::transition (State new_state) { LOG (Jetfix,Warn,"Jetfix connection {} transitioning from {} to {}", - me->cfg.name (), state_name (me->state), state_name (new_state)); + me->cfg.name (), + std::string(state_name (me->state)), + std::string(state_name (new_state))); me->state = new_state; } diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp index c47cf8095..a80c4b491 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp @@ -300,7 +300,7 @@ unique_ptr MDP3Main::prepare_handler(const string& channel_id) { return handler; } catch (std::exception& e) { - LOG(MarketData,Error,"{}", e.what()); + LOG(MarketData,Error,"{}", std::string(e.what())); throw; } } diff --git a/src/server/sparkd/orderman/components/NativeOrderMan.cpp b/src/server/sparkd/orderman/components/NativeOrderMan.cpp index ec79deaf9..2f8cb6e95 100644 --- a/src/server/sparkd/orderman/components/NativeOrderMan.cpp +++ b/src/server/sparkd/orderman/components/NativeOrderMan.cpp @@ -352,7 +352,8 @@ const char* NativeOrderMan::state_name(State state) void NativeOrderMan::transition(State new_state) { LOG(OrderMan,Info,"Transitioning NativeOrderMan from {} to {}", - state_name(me->state),state_name(new_state)); + std::string(state_name(me->state)), + std::string(state_name(new_state))); me->state = new_state; }