Converting logging calls

src/tools/exd_struct_gen/main.cpp

@@ -326,7 +326,7 @@ int main( int argc, char** argv )
   Logger::init( "struct_gen" );
   if( argc > 1 )
   {
-    Logger::info( "using dat path: " + std::string( argv[ 1 ] ) );
+    Logger::info( "using dat path: {0}", std::string( argv[ 1 ] ) );
     datLocation = std::string( argv[ 1 ] );
   }
 

src/tools/exd_struct_test/main.cpp

@@ -44,13 +44,13 @@ int main()
   //for( auto id : idList )
   {
     auto teri1 = g_exdData.get< Sapphire::Data::GilShopItem >( 262440, 0 );
-    Logger::info( "0 -> " + std::to_string( teri1->item ) );
+    Logger::info( "0 -> {0}", teri1->item );
 
     auto teri2 = g_exdData.get< Sapphire::Data::GilShopItem >( 262440, 1 );
-    Logger::info( "1 -> " + std::to_string( teri2->item ) );
+    Logger::info( "1 -> {0} ", teri2->item );
 
     auto teri3 = g_exdData.get< Sapphire::Data::GilShopItem >( 262440, 2 );
-    Logger::info( "2 -> " + std::to_string( teri3->item ) );
+    Logger::info( "2 -> {0}", teri3->item );
   }
 
   return 0;

src/tools/mob_parse/main.cpp

@@ -330,15 +330,10 @@ int dumpSpawns()
         std::string name = delChar( nameStruct->singular, ' ' );
         name = delChar( name, '\'' );
 
-        Logger::info( "|----> " + name + "_" +
+        Logger::info( "|----> {0}_{1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}",
-                      std::to_string( instance.bNPCBase ) + " " +
+                      name, instance.bNPCBase, instance.posX, instance.posY,
-                      std::to_string( instance.posX ) + ", " +
+                      instance.posZ, instance.modelChara, instance.gimmickId,
-                      std::to_string( instance.posY ) + ", " +
+                      instance.level, instance.hPMax );
-                      std::to_string( instance.posZ ) + ", " +
-                      std::to_string( instance.modelChara ) + ", " +
-                      std::to_string( instance.gimmickId ) + ", " +
-                      std::to_string( instance.level )  + ", " +
-                      std::to_string( instance.hPMax ) );
         //Logger::info( "|----> " + name + " - " + std::to_string( instance.bNPCBase ) + ", " + std::to_string( instance.gimmickId ) );
 
         output += "INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r` ) "
@@ -377,7 +372,7 @@ int dumpSpawns()
 
   }
 
-  Logger::info( "|--> Total SpawnGroups: " + std::to_string( spawngroups )  );
+  Logger::info( "|--> Total SpawnGroups: {0}", spawngroups );
 
   return 0;
 }
@@ -474,8 +469,8 @@ int dumpTemplates()
     //auto nameStruct = g_exdData.get< Sapphire::Data::BNpcName >( entry.first );
     auto teri1 = g_exdData.get< Sapphire::Data::TerritoryType >( entry.first );
     auto teriPlaceName = g_exdData.get< Sapphire::Data::PlaceName >( teri1->placeName );
-    Logger::info( std::to_string( entry.first ) + " - " + teri1->name + " - " + teriPlaceName->name );
+    Logger::info( "{0} - {1} - {2}", entry.first, teri1->name, teriPlaceName->name );
-    Logger::info( "Mob Count: " + std::to_string( entry.second.size() ) );
+    Logger::info( "Mob Count: {0}", entry.second.size() );
 
     for( auto mob : entry.second )
     {
@@ -485,12 +480,12 @@ int dumpTemplates()
       //Logger::info( nameStruct->singular + " " + std::to_string( packet.bNPCBase ) );
     }
 
-    Logger::info( "Unique Mobs: " + std::to_string( nameToPacketList.size() ) );
+    Logger::info( "Unique Mobs: {0}", nameToPacketList.size() );
 
     for( auto mobName : nameToPacketList )
     {
-      auto nameStruct = g_exdData.get< Sapphire::Data::BNpcName >( mobName.second.at(0).bNPCName );
+      auto nameStruct = g_exdData.get< Sapphire::Data::BNpcName >( mobName.second.at( 0 ).bNPCName );
-      Logger::info( "|--> " + nameStruct->singular + "(" + std::to_string( mobName.second.size() ) + ")" );
+      Logger::info( "|--> {0} ({1})", nameStruct->singular,  mobName.second.size() );
 
       auto instance = mobName.second.at(0);
       //for( FFXIVIpcNpcSpawn instance : mobName.second )

src/tools/quest_parser/main.cpp

@@ -362,7 +362,7 @@ int main( int argc, char** argv )
   uint32_t i = 0;
   for( const auto& row : rows )
   {
-    Logger::info( "Generating " + std::to_string( row ) );
+    Logger::info( "Generating {0}", row );
     auto questInfo = g_exdDataGen.get< Sapphire::Data::Quest >( row );
 
     if( questInfo->name.empty() || questInfo->id.empty() )
@@ -407,7 +407,7 @@ int main( int argc, char** argv )
         "generated/" + questInfo->id + ".lua";
       if( system( command.c_str() ) == -1 )
       {
-        Logger::error( "Error executing java command:\n" + command + "\nerrno: " + std::strerror( errno ) );
+        Logger::error( "Error executing java command:\n {0}\nerrno: {1}", command, std::strerror( errno ) );
         return errno;
       }
     }

src/world/Actor/EventObject.cpp

@@ -119,7 +119,7 @@ void Sapphire::Entity::EventObject::spawn( Sapphire::Entity::PlayerPtr pTarget )
   if( !pTarget->isObjSpawnIndexValid( spawnIndex ) )
     return;
 
-  Logger::debug( "Spawning EObj: id:" + std::to_string( getId() ) + " name:" + getName() );
+  Logger::debug( "Spawning EObj: id#{0} name={1}", getId(), getName() );
 
   auto eobjStatePacket = makeZonePacket< FFXIVIpcObjectSpawn >( getId(), pTarget->getId() );
   eobjStatePacket->data().spawnIndex = spawnIndex;
@@ -138,7 +138,7 @@ void Sapphire::Entity::EventObject::spawn( Sapphire::Entity::PlayerPtr pTarget )
 
 void Sapphire::Entity::EventObject::despawn( Sapphire::Entity::PlayerPtr pTarget )
 {
-  Logger::debug( "despawn eobj: " + std::to_string( getId() ) );
+  Logger::debug( "despawn eobj#{0}", getId() );
 
   pTarget->freeObjSpawnIndexForActorId( getId() );
 }

src/world/Actor/Player.cpp

@@ -891,9 +891,7 @@ void Sapphire::Entity::Player::setLookAt( uint8_t index, uint8_t value )
 // spawn this player for pTarget
 void Sapphire::Entity::Player::spawn( Entity::PlayerPtr pTarget )
 {
-  Logger::debug( "[" + std::to_string( pTarget->getId() ) + "] Spawning " +
+  Logger::debug( "[{0}] Spawning {1} for {2}", pTarget->getId(), getName(), pTarget->getName() );
-                 getName() + " for " +
-                 pTarget->getName() );
 
   pTarget->queuePacket( std::make_shared< PlayerSpawnPacket >( *getAsPlayer(), *pTarget ) );
 }
@@ -902,7 +900,7 @@ void Sapphire::Entity::Player::spawn( Entity::PlayerPtr pTarget )
 void Sapphire::Entity::Player::despawn( Entity::PlayerPtr pTarget )
 {
   auto pPlayer = pTarget;
-  Logger::debug( "despawning " + getName() + " for " + pTarget->getName() );
+  Logger::debug( "Despawning {0} for {1}", getName(), pTarget->getName() );
 
   pPlayer->freePlayerSpawnId( getId() );
 

src/world/Actor/PlayerEvent.cpp

@@ -75,7 +75,7 @@ void Sapphire::Entity::Player::directorPlayScene( uint32_t eventId, uint32_t sce
   auto pEvent = getEvent( eventId );
   if( !pEvent )
   {
-    Logger::error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
+    Logger::error( "Could not find event #{0}, event has not been started!", eventId );
     return;
   }
 
@@ -159,7 +159,7 @@ Sapphire::Event::EventHandlerPtr Sapphire::Entity::Player::bootstrapSceneEvent(
   auto pEvent = getEvent( eventId );
   if( !pEvent )
   {
-    Logger::error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
+    Logger::error( "Could not find event #{0}, event has not been started!", eventId );
     return nullptr;
   }
 
@@ -223,7 +223,7 @@ void Sapphire::Entity::Player::eventFinish( uint32_t eventId, uint32_t freePlaye
 
   if( !pEvent )
   {
-    Logger::error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
+    Logger::error( "Could not find event #{0}, event has not been started!", eventId );
     return;
   }
 
@@ -298,7 +298,7 @@ void Sapphire::Entity::Player::eventActionStart( uint32_t eventId,
   }
   else if( !pEvent )
   {
-    Logger::error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
+    Logger::error( "Could not find event #{0}, event has not been started!", eventId );
     return;
   }
 

src/world/Actor/PlayerSql.cpp

@@ -107,8 +107,8 @@ bool Sapphire::Entity::Player::load( uint32_t charId, World::SessionPtr pSession
   // see if a valid zone could be found for the character
   if( !pCurrZone )
   {
-    Logger::error( "[" + char_id_str + "] Zone " + std::to_string( zoneId ) + " not found!" );
+    Logger::error( "[{0}] Zone #{1} not found!", char_id_str, zoneId );
-    Logger::error( "[" + char_id_str + "] Setting default zone instead" );
+    Logger::error( "[{0}] Setting default zone instead", char_id_str );
 
     // default to new gridania
     // TODO: should probably just abort and mark character as corrupt
@@ -206,7 +206,7 @@ bool Sapphire::Entity::Player::load( uint32_t charId, World::SessionPtr pSession
   m_pCell = nullptr;
 
   if( !loadActiveQuests() || !loadClassData() || !loadSearchInfo() )
-    Logger::error( "Player id " + char_id_str + " data corrupt!" );
+    Logger::error( "Player #{0}  data corrupt!", char_id_str );
 
   m_maxHp = getMaxHp();
   m_maxMp = getMaxMp();

src/world/ServerMgr.cpp

@@ -273,7 +273,7 @@ void Sapphire::World::ServerMgr::mainLoop()
         it->second->close();
         // if( it->second.unique() )
         {
-          Logger::info( "[" + std::to_string( it->second->getId() ) + "] Session removal" );
+          Logger::info( "[{0}] Session removal", it->second->getId() );
           it = m_sessionMapById.erase( it );
           removeSession( pPlayer->getName() );
           continue;
@@ -283,7 +283,7 @@ void Sapphire::World::ServerMgr::mainLoop()
       // remove sessions that simply timed out
       if( diff > 20 )
       {
-        Logger::info( "[" + std::to_string( it->second->getId() ) + "] Session time out" );
+        Logger::info( "[{0}] Session time out", it->second->getId() );
 
         it->second->close();
         // if( it->second.unique() )
@@ -312,18 +312,18 @@ bool Sapphire::World::ServerMgr::createSession( uint32_t sessionId )
 
   if( it != m_sessionMapById.end() )
   {
-    Logger::error( "[" + session_id_str + "] Error creating session" );
+    Logger::error( "[{0}] Error creating session", session_id_str );
     return false;
   }
 
-  Logger::info( "[" + session_id_str + "] Creating new session" );
+  Logger::info( "[{0}] Creating new session", session_id_str );
 
   std::shared_ptr< Session > newSession( new Session( sessionId, framework() ) );
   m_sessionMapById[ sessionId ] = newSession;
 
   if( !newSession->loadPlayer() )
   {
-    Logger::error( "[" + session_id_str + "] Error loading player " + session_id_str );
+    Logger::error( "[{0}] Error loading player {0}", session_id_str );
     return false;
   }
 
@@ -437,7 +437,7 @@ void Sapphire::World::ServerMgr::loadBNpcTemplates()
     m_bNpcTemplateMap[ name ] = bnpcTemplate;
   }
 
-  Logger::debug( "BNpc Templates loaded: " + std::to_string( m_bNpcTemplateMap.size() ) );
+  Logger::debug( "BNpc Templates loaded: {0}", m_bNpcTemplateMap.size() );
 
 }
 

src/world/Session.cpp

@@ -151,7 +151,7 @@ void Sapphire::World::Session::startReplay( const std::string& path )
     m_replayCache.push_back( std::tuple< uint64_t, std::string >(
       Util::getTimeMs() + ( std::get< 0 >( set ) - startTime ), std::get< 1 >( set ) ) );
 
-    Logger::info( "Registering " + std::get< 1 >( set ) + " for " + std::to_string( std::get< 0 >( set ) - startTime ) );
+    Logger::info( "Registering {0} for {1}", std::get< 1 >( set ), std::get< 0 >( set ) - startTime );
   }
 
   getPlayer()->sendDebug( "Registered " + std::to_string( m_replayCache.size() ) + " sets for replay" );