2
0
Эх сурвалжийг харах

logging rework, part 3 (i hope not much more to come)

janiii 15 жил өмнө
parent
commit
47c3bc195f
42 өөрчлөгдсөн 187 нэмэгдсэн , 127 устгасан
  1. 2 2
      L2_GameServer/java/com/l2jserver/L2DatabaseFactory.java
  2. 7 6
      L2_GameServer/java/com/l2jserver/gameserver/SevenSigns.java
  3. 6 5
      L2_GameServer/java/com/l2jserver/gameserver/SevenSignsFestival.java
  4. 2 1
      L2_GameServer/java/com/l2jserver/gameserver/Universe.java
  5. 4 8
      L2_GameServer/java/com/l2jserver/gameserver/datatables/AccessLevels.java
  6. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/datatables/UITable.java
  7. 0 4
      L2_GameServer/java/com/l2jserver/gameserver/instancemanager/CursedWeaponsManager.java
  8. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/instancemanager/RaidBossPointsManager.java
  9. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/model/AutoChatHandler.java
  10. 3 4
      L2_GameServer/java/com/l2jserver/gameserver/model/AutoSpawnHandler.java
  11. 3 2
      L2_GameServer/java/com/l2jserver/gameserver/model/BlockList.java
  12. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/model/CursedWeapon.java
  13. 10 10
      L2_GameServer/java/com/l2jserver/gameserver/model/L2Clan.java
  14. 8 6
      L2_GameServer/java/com/l2jserver/gameserver/model/L2ClanMember.java
  15. 2 1
      L2_GameServer/java/com/l2jserver/gameserver/model/L2GroupSpawn.java
  16. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/model/L2Territory.java
  17. 4 3
      L2_GameServer/java/com/l2jserver/gameserver/model/ShortCuts.java
  18. 4 2
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Character.java
  19. 2 1
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2AirShipInstance.java
  20. 2 1
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2BoatInstance.java
  21. 66 19
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
  22. 5 5
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java
  23. 2 1
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2SignsPriestInstance.java
  24. 2 2
      L2_GameServer/java/com/l2jserver/gameserver/model/entity/Couple.java
  25. 4 3
      L2_GameServer/java/com/l2jserver/gameserver/model/entity/Instance.java
  26. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/model/entity/L2Event.java
  27. 3 2
      L2_GameServer/java/com/l2jserver/gameserver/model/entity/TvTEvent.java
  28. 2 2
      L2_GameServer/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java
  29. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/model/quest/QuestState.java
  30. 2 1
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerFriendInvite.java
  31. 2 1
      L2_GameServer/java/com/l2jserver/gameserver/network/communityserver/readpackets/RequestWorldInfo.java
  32. 4 3
      L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java
  33. 2 1
      L2_GameServer/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellPathFinding.java
  34. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/script/faenor/FaenorEventParser.java
  35. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/script/faenor/FaenorWorldDataParser.java
  36. 2 2
      L2_GameServer/java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java
  37. 5 3
      L2_GameServer/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSiegeFlag.java
  38. 3 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSpawn.java
  39. 4 4
      L2_GameServer/java/com/l2jserver/gameserver/taskmanager/TaskManager.java
  40. 2 2
      L2_GameServer/java/com/l2jserver/gameserver/taskmanager/tasks/TaskSevenSignsUpdate.java
  41. 3 4
      L2_GameServer/java/com/l2jserver/gameserver/templates/effects/EffectTemplate.java
  42. 7 6
      L2_GameServer/java/com/l2jserver/loginserver/LoginController.java

+ 2 - 2
L2_GameServer/java/com/l2jserver/L2DatabaseFactory.java

@@ -114,7 +114,7 @@ public class L2DatabaseFactory
 		{
 		{
 			if (Config.DEBUG)
 			if (Config.DEBUG)
 				_log.fine("Database Connection FAILED");
 				_log.fine("Database Connection FAILED");
-			throw new SQLException("could not init DB connection:" + e);
+			throw new SQLException("Could not init DB connection:" + e.getMessage());
 		}
 		}
 	}
 	}
 	
 	
@@ -224,7 +224,7 @@ public class L2DatabaseFactory
 			}
 			}
 			catch (SQLException e)
 			catch (SQLException e)
 			{
 			{
-				_log.warning("L2DatabaseFactory: getConnection() failed, trying again " + e);
+				_log.log(Level.WARNING, "L2DatabaseFactory: getConnection() failed, trying again " + e.getMessage(), e);
 			}
 			}
 		}
 		}
 		return con;
 		return con;

+ 7 - 6
L2_GameServer/java/com/l2jserver/gameserver/SevenSigns.java

@@ -22,6 +22,7 @@ import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collection;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
 import com.l2jserver.Config;
 import com.l2jserver.Config;
@@ -180,7 +181,7 @@ public class SevenSigns
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.severe("SevenSigns: Failed to load configuration: " + e);
+			_log.log(Level.SEVERE, "SevenSigns: Failed to load configuration: " + e.getMessage(), e);
 		}
 		}
 		
 		
 		_log.info("SevenSigns: Currently in the " + getCurrentPeriodName() + " period!");
 		_log.info("SevenSigns: Currently in the " + getCurrentPeriodName() + " period!");
@@ -802,7 +803,7 @@ public class SevenSigns
 		}
 		}
 		catch (SQLException e)
 		catch (SQLException e)
 		{
 		{
-			_log.severe("SevenSigns: Unable to load Seven Signs data from database: " + e);
+			_log.log(Level.SEVERE, "SevenSigns: Unable to load Seven Signs data from database: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -861,7 +862,7 @@ public class SevenSigns
 		}
 		}
 		catch (SQLException e)
 		catch (SQLException e)
 		{
 		{
-			_log.severe("SevenSigns: Unable to save data to database: " + e);
+			_log.log(Level.SEVERE, "SevenSigns: Unable to save data to database: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -903,7 +904,7 @@ public class SevenSigns
 		}
 		}
 		catch (SQLException e)
 		catch (SQLException e)
 		{
 		{
-			_log.severe("SevenSigns: Unable to save data to database: " + e);
+			_log.log(Level.SEVERE, "SevenSigns: Unable to save data to database: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -959,7 +960,7 @@ public class SevenSigns
 		}
 		}
 		catch (SQLException e)
 		catch (SQLException e)
 		{
 		{
-			_log.severe("SevenSigns: Unable to save data to database: " + e);
+			_log.log(Level.SEVERE, "SevenSigns: Unable to save data to database: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -1061,7 +1062,7 @@ public class SevenSigns
 			}
 			}
 			catch (SQLException e)
 			catch (SQLException e)
 			{
 			{
-				_log.severe("SevenSigns: Failed to save data: " + e);
+				_log.log(Level.SEVERE, "SevenSigns: Failed to save data: " + e.getMessage(), e);
 			}
 			}
 			finally
 			finally
 			{
 			{

+ 6 - 5
L2_GameServer/java/com/l2jserver/gameserver/SevenSignsFestival.java

@@ -22,6 +22,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledFuture;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
 import javolution.util.FastList;
 import javolution.util.FastList;
@@ -1001,7 +1002,7 @@ public class SevenSignsFestival implements SpawnListener
 		}
 		}
 		catch (SQLException e)
 		catch (SQLException e)
 		{
 		{
-			_log.severe("SevenSignsFestival: Failed to load configuration: " + e);
+			_log.log(Level.SEVERE, "SevenSignsFestival: Failed to load configuration: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -1084,7 +1085,7 @@ public class SevenSignsFestival implements SpawnListener
 		}
 		}
 		catch (SQLException e)
 		catch (SQLException e)
 		{
 		{
-			_log.severe("SevenSignsFestival: Failed to save configuration: " + e);
+			_log.log(Level.SEVERE, "SevenSignsFestival: Failed to save configuration: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -1191,7 +1192,7 @@ public class SevenSignsFestival implements SpawnListener
 			}
 			}
 			catch (Exception e)
 			catch (Exception e)
 			{
 			{
-				_log.warning("could not get clan name of " + partyMemberName + ": " + e);
+				_log.log(Level.WARNING, "Could not get clan name of " + partyMemberName + ": " + e.getMessage(), e);
 			}
 			}
 			finally
 			finally
 			{
 			{
@@ -2156,7 +2157,7 @@ public class SevenSignsFestival implements SpawnListener
 			}
 			}
 			catch (Exception e)
 			catch (Exception e)
 			{
 			{
-				_log.warning("SevenSignsFestival: Error while spawning Festival Witch ID " + _witchSpawn._npcId + ": " + e);
+				_log.log(Level.WARNING, "SevenSignsFestival: Error while spawning Festival Witch ID " + _witchSpawn._npcId + ": " + e.getMessage(), e);
 			}
 			}
 			
 			
 			// Make it appear as though the Witch has apparated there.
 			// Make it appear as though the Witch has apparated there.
@@ -2302,7 +2303,7 @@ public class SevenSignsFestival implements SpawnListener
 				}
 				}
 				catch (Exception e)
 				catch (Exception e)
 				{
 				{
-					_log.warning("SevenSignsFestival: Error while spawning NPC ID " + currSpawn._npcId + ": " + e);
+					_log.log(Level.WARNING, "SevenSignsFestival: Error while spawning NPC ID " + currSpawn._npcId + ": " + e.getMessage(), e);
 				}
 				}
 			}
 			}
 		}
 		}

+ 2 - 1
L2_GameServer/java/com/l2jserver/gameserver/Universe.java

@@ -33,6 +33,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.List;
 import java.util.StringTokenizer;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
 import java.util.TreeSet;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPInputStream;
 
 
@@ -292,7 +293,7 @@ public class Universe implements java.io.Serializable
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("cannot create universe.png: " + e);
+			_log.log(Level.WARNING, "Cannot create universe.png: " + e.getMessage(), e);
 		}
 		}
 	}
 	}
 	
 	

+ 4 - 8
L2_GameServer/java/com/l2jserver/gameserver/datatables/AccessLevels.java

@@ -27,7 +27,6 @@ import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.model.L2AccessLevel;
 import com.l2jserver.gameserver.model.L2AccessLevel;
 
 
-
 /**
 /**
  * @author FBIagent<br>
  * @author FBIagent<br>
  */
  */
@@ -97,20 +96,17 @@ public class AccessLevels
 				
 				
 				if (accessLevel == _userAccessLevelNum)
 				if (accessLevel == _userAccessLevelNum)
 				{
 				{
-					_log.warning("AccessLevels: Access level with name " + name + " is using reserved user access level "
-							+ _userAccessLevelNum + ". Ignoring it!");
+					_log.warning("AccessLevels: Access level with name " + name + " is using reserved user access level " + _userAccessLevelNum + ". Ignoring it!");
 					continue;
 					continue;
 				}
 				}
 				else if (accessLevel == _masterAccessLevelNum)
 				else if (accessLevel == _masterAccessLevelNum)
 				{
 				{
-					_log.warning("AccessLevels: Access level with name " + name + " is using reserved master access level "
-							+ _masterAccessLevelNum + ". Ignoring it!");
+					_log.warning("AccessLevels: Access level with name " + name + " is using reserved master access level " + _masterAccessLevelNum + ". Ignoring it!");
 					continue;
 					continue;
 				}
 				}
 				else if (accessLevel < 0)
 				else if (accessLevel < 0)
 				{
 				{
-					_log.warning("AccessLevels: Access level with name " + name
-							+ " is using banned access level state(below 0). Ignoring it!");
+					_log.warning("AccessLevels: Access level with name " + name + " is using banned access level state(below 0). Ignoring it!");
 					continue;
 					continue;
 				}
 				}
 				
 				
@@ -222,4 +218,4 @@ public class AccessLevels
 	{
 	{
 		protected static final AccessLevels _instance = new AccessLevels();
 		protected static final AccessLevels _instance = new AccessLevels();
 	}
 	}
-}
+}

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/datatables/UITable.java

@@ -132,7 +132,7 @@ public class UITable
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("error while creating UI Default Keys table " + e);
+			_log.log(Level.WARNING, "Error while creating UI Default Keys table " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{

+ 0 - 4
L2_GameServer/java/com/l2jserver/gameserver/instancemanager/CursedWeaponsManager.java

@@ -180,8 +180,6 @@ public class CursedWeaponsManager
 		{
 		{
 			_log.log(Level.SEVERE, "Error parsing cursed weapons file.", e);
 			_log.log(Level.SEVERE, "Error parsing cursed weapons file.", e);
 			
 			
-			if (Config.DEBUG)
-				_log.warning("ERROR");
 			return;
 			return;
 		}
 		}
 	}
 	}
@@ -227,8 +225,6 @@ public class CursedWeaponsManager
 		{
 		{
 			_log.log(Level.WARNING, "Could not restore CursedWeapons data: " + e.getMessage(), e);
 			_log.log(Level.WARNING, "Could not restore CursedWeapons data: " + e.getMessage(), e);
 			
 			
-			if (Config.DEBUG)
-				_log.warning("ERROR");
 			return;
 			return;
 		}
 		}
 		finally
 		finally

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/instancemanager/RaidBossPointsManager.java

@@ -99,7 +99,6 @@ public class RaidBossPointsManager
 			}
 			}
 			catch(Exception e)
 			catch(Exception e)
 			{
 			{
-				_log.warning(e.getMessage());
 			}
 			}
 		}
 		}
 	}
 	}

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/AutoChatHandler.java

@@ -107,7 +107,7 @@ public class AutoChatHandler implements SpawnListener
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("AutoSpawnHandler: Could not restore chat data: " + e);
+			_log.log(Level.WARNING, "AutoSpawnHandler: Could not restore chat data: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{

+ 3 - 4
L2_GameServer/java/com/l2jserver/gameserver/model/AutoSpawnHandler.java

@@ -170,7 +170,7 @@ public class AutoSpawnHandler
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("AutoSpawnHandler: Could not restore spawn data: " + e);
+			_log.log(Level.WARNING, "AutoSpawnHandler: Could not restore spawn data: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -270,8 +270,7 @@ public class AutoSpawnHandler
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("AutoSpawnHandler: Could not auto spawn for NPC ID " + spawnInst._npcId + " (Object ID = " + spawnInst._objectId
-					+ "): " + e);
+			_log.log(Level.WARNING, "AutoSpawnHandler: Could not auto spawn for NPC ID " + spawnInst._npcId + " (Object ID = " + spawnInst._objectId + "): " + e.getMessage(), e);
 			return false;
 			return false;
 		}
 		}
 		
 		
@@ -606,7 +605,7 @@ public class AutoSpawnHandler
 			}
 			}
 			catch (Exception e)
 			catch (Exception e)
 			{
 			{
-				_log.warning("AutoSpawnHandler: An error occurred while despawning spawn (Object ID = " + _objectId + "): " + e);
+				_log.log(Level.WARNING, "AutoSpawnHandler: An error occurred while despawning spawn (Object ID = " + _objectId + "): " + e.getMessage(), e);
 			}
 			}
 		}
 		}
 	}
 	}

+ 3 - 2
L2_GameServer/java/com/l2jserver/gameserver/model/BlockList.java

@@ -29,6 +29,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSet;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
 import javolution.util.FastList;
 import javolution.util.FastList;
@@ -105,7 +106,7 @@ public class BlockList
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("Error found in " + ObjId + " FriendList while loading BlockList: " + e);
+			_log.log(Level.WARNING, "Error found in " + ObjId + " FriendList while loading BlockList: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -138,7 +139,7 @@ public class BlockList
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("Could not add block player: " + e);
+			_log.log(Level.WARNING, "Could not add block player: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/CursedWeapon.java

@@ -167,7 +167,7 @@ public class CursedWeapon
 	    		}
 	    		}
 	    		catch (Exception e)
 	    		catch (Exception e)
 	    		{
 	    		{
-	    			_log.warning("Could not delete : " + e);
+	    			_log.log(Level.WARNING, "Could not delete : " + e.getMessage(), e);
 	    		}
 	    		}
 	    		finally
 	    		finally
 	    		{
 	    		{

+ 10 - 10
L2_GameServer/java/com/l2jserver/gameserver/model/L2Clan.java

@@ -1084,7 +1084,7 @@ public class L2Clan
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("Error could not store clan notice: " + e);
+			_log.log(Level.WARNING, "Error could not store clan notice: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -1228,7 +1228,7 @@ public class L2Clan
 			}
 			}
 			catch (Exception e)
 			catch (Exception e)
 			{
 			{
-				_log.warning("Error could not store clan skills: " + e);
+				_log.log(Level.WARNING, "Error could not store clan skills: " + e.getMessage(), e);
 			}
 			}
 			finally
 			finally
 			{
 			{
@@ -1622,7 +1622,7 @@ public class L2Clan
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("Could not restore clan sub-units: " + e);
+			_log.log(Level.WARNING, "Could not restore clan sub-units: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -1900,7 +1900,7 @@ public class L2Clan
 			}
 			}
 			catch (Exception e)
 			catch (Exception e)
 			{
 			{
-				_log.warning("Could not store clan privs for rank: " + e);
+				_log.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e);
 			}
 			}
 			finally
 			finally
 			{
 			{
@@ -1946,7 +1946,7 @@ public class L2Clan
 			}
 			}
 			catch (Exception e)
 			catch (Exception e)
 			{
 			{
-				_log.warning("Could not create new rank and store clan privs for rank: " + e);
+				_log.log(Level.WARNING, "Could not create new rank and store clan privs for rank: " + e.getMessage(), e);
 			}
 			}
 			finally
 			finally
 			{
 			{
@@ -2073,7 +2073,7 @@ public class L2Clan
 			}
 			}
 			catch (Exception e)
 			catch (Exception e)
 			{
 			{
-				_log.warning("Could not store auction for clan: " + e);
+				_log.log(Level.WARNING, "Could not store auction for clan: " + e.getMessage(), e);
 			}
 			}
 			finally
 			finally
 			{
 			{
@@ -2676,7 +2676,7 @@ public class L2Clan
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("could not increase clan level:" + e);
+			_log.log(Level.WARNING, "could not increase clan level:" + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -2749,7 +2749,7 @@ public class L2Clan
 		}
 		}
 		catch (SQLException e)
 		catch (SQLException e)
 		{
 		{
-			_log.warning("Could not update crest for clan " + getName() + " [" + getClanId() + "] : " + e.getMessage());
+			_log.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getClanId() + "] : " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -2794,7 +2794,7 @@ public class L2Clan
 		}
 		}
 		catch (SQLException e)
 		catch (SQLException e)
 		{
 		{
-			_log.warning("Could not update ally crest for ally/clan id " + allyId + " : " + e.getMessage());
+			_log.log(Level.WARNING, "Could not update ally crest for ally/clan id " + allyId + " : " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -2855,7 +2855,7 @@ public class L2Clan
 		}
 		}
 		catch (SQLException e)
 		catch (SQLException e)
 		{
 		{
-			_log.warning("Could not update large crest for clan " + getName() + " [" + getClanId() + "] : " + e.getMessage());
+			_log.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getClanId() + "] : " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{

+ 8 - 6
L2_GameServer/java/com/l2jserver/gameserver/model/L2ClanMember.java

@@ -17,6 +17,8 @@ package com.l2jserver.gameserver.model;
 import java.sql.Connection;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.SQLException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.instancemanager.SiegeManager;
 import com.l2jserver.gameserver.instancemanager.SiegeManager;
@@ -24,12 +26,12 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 
 
 
 /**
 /**
- * This class ...
- *
- * @version $Revision: 1.5.4.2 $ $Date: 2005/03/27 15:29:33 $
+ * Clan member class.
  */
  */
 public class L2ClanMember
 public class L2ClanMember
 {
 {
+	private static final Logger _log = Logger.getLogger(L2ClanMember.class.getName());
+	
 	private L2Clan _clan;
 	private L2Clan _clan;
 	private int _objectId;
 	private int _objectId;
 	private String _name;
 	private String _name;
@@ -248,7 +250,7 @@ public class L2ClanMember
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			//_log.warning("could not set char power_grade:"+e);
+			_log.log(Level.WARNING, "Could not update pledge type: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -298,7 +300,7 @@ public class L2ClanMember
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			//_log.warning("could not set char power_grade:"+e);
+			_log.log(Level.WARNING, "Could not update power _grade: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -638,7 +640,7 @@ public class L2ClanMember
          }
          }
          catch (SQLException e)
          catch (SQLException e)
          {
          {
-             //_log.warning("could not set apprentice/sponsor:"+e.getMessage());
+             _log.log(Level.WARNING, "Could not save apprentice/sponsor: " + e.getMessage(), e);
          }
          }
          finally
          finally
          {
          {

+ 2 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/L2GroupSpawn.java

@@ -15,6 +15,7 @@
 package com.l2jserver.gameserver.model;
 package com.l2jserver.gameserver.model;
 
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Constructor;
+import java.util.logging.Level;
 
 
 import com.l2jserver.Config;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.Territory;
 import com.l2jserver.gameserver.Territory;
@@ -99,7 +100,7 @@ public class L2GroupSpawn extends L2Spawn
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("NPC class not found: " + e);
+			_log.log(Level.WARNING, "NPC class not found: " + e.getMessage(), e);
 			return null;
 			return null;
 		}
 		}
 	}
 	}

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/L2Territory.java

@@ -168,7 +168,7 @@ public class L2Territory
 			    return p;
 			    return p;
 			}
 			}
 		}
 		}
-		_log.warning("Can't make point for territory"+_terr);
+		_log.warning("Can't make point for territory " + _terr);
 		return p;
 		return p;
 	}
 	}
     public int getProcMax()
     public int getProcMax()

+ 4 - 3
L2_GameServer/java/com/l2jserver/gameserver/model/ShortCuts.java

@@ -19,6 +19,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSet;
 import java.util.Map;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.TreeMap;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.L2DatabaseFactory;
@@ -106,7 +107,7 @@ public class ShortCuts
         }
         }
         catch (Exception e)
         catch (Exception e)
         {
         {
-			_log.warning("Could not store character shortcut: " + e);
+			_log.log(Level.WARNING, "Could not store character shortcut: " + e.getMessage(), e);
         }
         }
         finally
         finally
         {
         {
@@ -179,7 +180,7 @@ public class ShortCuts
         }
         }
         catch (Exception e)
         catch (Exception e)
         {
         {
-			_log.warning("Could not delete character shortcut: " + e);
+			_log.log(Level.WARNING, "Could not delete character shortcut: " + e.getMessage(), e);
         }
         }
         finally
         finally
         {
         {
@@ -218,7 +219,7 @@ public class ShortCuts
         }
         }
         catch (Exception e)
         catch (Exception e)
         {
         {
-			_log.warning("Could not restore character shortcuts: " + e);
+			_log.log(Level.WARNING, "Could not restore character shortcuts: " + e.getMessage(), e);
         }
         }
         finally
         finally
         {
         {

+ 4 - 2
L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -2353,6 +2353,9 @@ public abstract class L2Character extends L2Object
 			{
 			{
 				for (L2PcInstance player : plrs)
 				for (L2PcInstance player : plrs)
 				{
 				{
+					if (player == null)
+						continue;
+					
 					if (getRunSpeed() == 0)
 					if (getRunSpeed() == 0)
 						player.sendPacket(new ServerObjectInfo((L2Npc) this, player));
 						player.sendPacket(new ServerObjectInfo((L2Npc) this, player));
 					else
 					else
@@ -2631,8 +2634,7 @@ public abstract class L2Character extends L2Object
 			}
 			}
 			catch (Exception e)
 			catch (Exception e)
 			{
 			{
-				_log.info("NotifyAITask failed. "+ e);
-				e.printStackTrace();
+				_log.log(Level.WARNING, "NotifyAITask failed. " + e.getMessage(), e);
 			}
 			}
 		}
 		}
 	}
 	}

+ 2 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2AirShipInstance.java

@@ -22,6 +22,7 @@ import java.io.LineNumberReader;
 import java.util.Collection;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.StringTokenizer;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
 import com.l2jserver.Config;
 import com.l2jserver.Config;
@@ -126,7 +127,7 @@ public class L2AirShipInstance extends L2Character
 			}
 			}
 			catch (Exception e)
 			catch (Exception e)
 			{
 			{
-				_airShiplog.warning("error while creating airship table " + e);
+				_airShiplog.log(Level.WARNING, "Error while creating airship table " + e.getMessage(), e);
 			}
 			}
 			finally
 			finally
 			{
 			{

+ 2 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2BoatInstance.java

@@ -22,6 +22,7 @@ import java.io.LineNumberReader;
 import java.util.Collection;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.StringTokenizer;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
 import com.l2jserver.Config;
 import com.l2jserver.Config;
@@ -181,7 +182,7 @@ public class L2BoatInstance extends L2Character
 			}
 			}
 			catch (Exception e)
 			catch (Exception e)
 			{
 			{
-				_logBoat.warning("error while creating boat table " + e);
+				_logBoat.log(Level.WARNING, "Error while creating boat table " + e.getMessage(), e);
 			}
 			}
 			finally
 			finally
 			{
 			{

+ 66 - 19
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -7206,7 +7206,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.severe("Could not insert char data: " + e);
+			_log.log(Level.SEVERE, "Could not insert char data: " + e.getMessage(), e);
 			return false;
 			return false;
 		}
 		}
 		finally
 		finally
@@ -7627,8 +7627,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			if (_log.isLoggable(Level.SEVERE))
-				_log.warning("Could not restore recipe book data:" + e);
+			_log.log(Level.SEVERE, "Could not restore recipe book data:" + e.getMessage(), e);
 		}
 		}
 		finally {
 		finally {
 			try { con.close(); } catch (Exception e) {}
 			try { con.close(); } catch (Exception e) {}
@@ -7744,8 +7743,20 @@ public final class L2PcInstance extends L2Playable
 			statement.execute();
 			statement.execute();
 			statement.close();
 			statement.close();
 		}
 		}
-		catch (Exception e) { _log.warning("Could not store char base data: "+ e); }
-		finally { try { con.close(); } catch (Exception e) {} }
+		catch (Exception e)
+		{
+			_log.log(Level.WARNING, "Could not store char base data: " + e.getMessage(), e);
+		}
+		finally
+		{
+			try
+			{
+				con.close();
+			}
+			catch (Exception e)
+			{
+			}
+		}
 	}
 	}
 
 
 	private void storeCharSub()
 	private void storeCharSub()
@@ -7775,7 +7786,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("Could not store sub class data for " + getName() + ": " + e);
+			_log.log(Level.WARNING, "Could not store sub class data for " + getName() + ": " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -8012,7 +8023,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("Error could not delete skill: " + e);
+			_log.log(Level.WARNING, "Error could not delete skill: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -8079,7 +8090,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("Error could not store char skills: " + e);
+			_log.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -8125,7 +8136,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("Could not restore character "+this+ " skills: " + e);
+			_log.log(Level.WARNING, "Could not restore character " + this + " skills: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -10481,7 +10492,7 @@ public final class L2PcInstance extends L2Playable
                 statement.execute();
                 statement.execute();
             }
             }
             catch (Exception e) {
             catch (Exception e) {
-                _log.warning("WARNING: Could not add character sub class for " + getName() + ": " + e);
+                _log.log(Level.WARNING, "WARNING: Could not add character sub class for " + getName() + ": " + e.getMessage(), e);
                 return false;
                 return false;
             }
             }
             finally
             finally
@@ -10607,7 +10618,7 @@ public final class L2PcInstance extends L2Playable
             }
             }
             catch (Exception e)
             catch (Exception e)
             {
             {
-            	_log.warning("Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e);
+            	_log.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e);
 
 
             	// This must be done in order to maintain data consistency.
             	// This must be done in order to maintain data consistency.
                 getSubClasses().remove(classIndex);
                 getSubClasses().remove(classIndex);
@@ -10753,7 +10764,7 @@ public final class L2PcInstance extends L2Playable
 				}
 				}
 				catch (Exception e)
 				catch (Exception e)
 				{
 				{
-					_log.info("Could not switch " + getName() + "'s sub class to class index " + classIndex + ": " + e);
+					_log.log(Level.WARNING, "Could not switch " + getName() + "'s sub class to class index " + classIndex + ": " + e.getMessage(), e);
 					return false;
 					return false;
 				}
 				}
 			}
 			}
@@ -14052,8 +14063,20 @@ public final class L2PcInstance extends L2Playable
     				statement.execute();
     				statement.execute();
     				statement.close();
     				statement.close();
     			}
     			}
-    			catch (Exception e) { _log.warning("Could not update character teleport bookmark data: "+ e); }
-    			finally { try { con.close(); } catch (Exception e) {} }
+				catch (Exception e)
+				{
+					_log.log(Level.WARNING, "Could not update character teleport bookmark data: " + e.getMessage(), e);
+				}
+				finally
+				{
+					try
+					{
+						con.close();
+					}
+					catch (Exception e)
+					{
+					}
+				}
     			
     			
     		}
     		}
     		count++;
     		count++;
@@ -14078,8 +14101,20 @@ public final class L2PcInstance extends L2Playable
 			statement.execute();
 			statement.execute();
 			statement.close();
 			statement.close();
 		}
 		}
-		catch (Exception e) { _log.warning("Could not delete character teleport bookmark data: "+ e); }
-		finally { try { con.close(); } catch (Exception e) {} }
+		catch (Exception e)
+		{
+			_log.log(Level.WARNING, "Could not delete character teleport bookmark data: " + e.getMessage(), e);
+		}
+		finally
+		{
+			try
+			{
+				con.close();
+			}
+			catch (Exception e)
+			{
+			}
+		}
 		
 		
 		int count = 0;
 		int count = 0;
 		int size = tpbookmark.size();
 		int size = tpbookmark.size();
@@ -14269,8 +14304,20 @@ public final class L2PcInstance extends L2Playable
 			statement.execute();
 			statement.execute();
 			statement.close();
 			statement.close();
 		}
 		}
-		catch (Exception e) { _log.warning("Could not insert character teleport bookmark data: "+ e); }
-		finally { try { con.close(); } catch (Exception e) {} }
+		catch (Exception e)
+		{
+			_log.log(Level.WARNING, "Could not insert character teleport bookmark data: " + e.getMessage(), e);
+		}
+		finally
+		{
+			try
+			{
+				con.close();
+			}
+			catch (Exception e)
+			{
+			}
+		}
 		
 		
 		sendPacket(new ExGetBookMarkInfoPacket(this));
 		sendPacket(new ExGetBookMarkInfoPacket(this));
     }
     }
@@ -14552,7 +14599,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("Error found in " + getName() + "'s FriendList: " + e);
+			_log.log(Level.WARNING, "Error found in " + getName() + "'s FriendList: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{

+ 5 - 5
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java

@@ -676,7 +676,7 @@ public class L2PetInstance extends L2Summon
 		}
 		}
 		catch(Exception e)
 		catch(Exception e)
 		{
 		{
-			_logPet.warning("Give all items error " + e);
+			_logPet.log(Level.WARNING, "Give all items error: " + e.getMessage(), e);
 		}
 		}
 	}
 	}
 
 
@@ -693,7 +693,7 @@ public class L2PetInstance extends L2Summon
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
         {
         {
-            _logPet.warning("Error while giving item to owner: " + e);
+            _logPet.log(Level.WARNING, "Error while giving item to owner: " + e.getMessage(), e);
         }
         }
 	}
 	}
 
 
@@ -735,7 +735,7 @@ public class L2PetInstance extends L2Summon
 			world.removeObject(removedItem);
 			world.removeObject(removedItem);
 		}
 		}
 		catch (Exception e){
 		catch (Exception e){
-			_logPet.warning("Error while destroying control item: " + e);
+			_logPet.log(Level.WARNING, "Error while destroying control item: " + e.getMessage(), e);
 		}
 		}
 
 
 		// pet control item no longer exists, delete the pet from the db
 		// pet control item no longer exists, delete the pet from the db
@@ -769,7 +769,7 @@ public class L2PetInstance extends L2Summon
 		}
 		}
 		catch(Exception e)
 		catch(Exception e)
 		{
 		{
-			_logPet.warning("Pet Drop Error: " + e);
+			_logPet.log(Level.WARNING, "Pet Drop Error: " + e.getMessage(), e);
 		}
 		}
 	}
 	}
 
 
@@ -858,7 +858,7 @@ public class L2PetInstance extends L2Summon
 			statement.close();
 			statement.close();
 			return pet;
 			return pet;
 		} catch (Exception e) {
 		} catch (Exception e) {
-			_logPet.warning("could not restore pet data: "+ e);
+			_logPet.log(Level.WARNING, "Could not restore pet data: "+ e.getMessage(), e);
 			return null;
 			return null;
 		} finally {
 		} finally {
 			try { con.close(); } catch (Exception e) {}
 			try { con.close(); } catch (Exception e) {}

+ 2 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2SignsPriestInstance.java

@@ -15,6 +15,7 @@
 package com.l2jserver.gameserver.model.actor.instance;
 package com.l2jserver.gameserver.model.actor.instance;
 
 
 import java.util.StringTokenizer;
 import java.util.StringTokenizer;
+import java.util.logging.Level;
 
 
 import javolution.text.TextBuilder;
 import javolution.text.TextBuilder;
 
 
@@ -595,7 +596,7 @@ public class L2SignsPriestInstance extends L2Npc
 				}
 				}
 				catch (Exception e)
 				catch (Exception e)
 				{
 				{
-					_log.warning("SevenSigns: Error occurred while teleporting player: " + e);
+					_log.log(Level.WARNING, "SevenSigns: Error occurred while teleporting player: " + e.getMessage(), e);
 				}
 				}
 				break;
 				break;
 			case 16:
 			case 16:

+ 2 - 2
L2_GameServer/java/com/l2jserver/gameserver/model/entity/Couple.java

@@ -77,7 +77,7 @@ public class Couple
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.severe("Exception: Couple.load(): " + e);
+			_log.log(Level.SEVERE, "Exception: Couple.load(): " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -185,7 +185,7 @@ public class Couple
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.severe("Exception: Couple.divorce(): " + e);
+			_log.log(Level.SEVERE, "Exception: Couple.divorce(): " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{

+ 4 - 3
L2_GameServer/java/com/l2jserver/gameserver/model/entity/Instance.java

@@ -8,6 +8,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledFuture;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -370,11 +371,11 @@ public class Instance
 		}
 		}
 		catch (IOException e)
 		catch (IOException e)
 		{
 		{
-			_log.warning("Instance: can not find " + xml.getAbsolutePath() + " ! " + e);
+			_log.log(Level.WARNING, "Instance: can not find " + xml.getAbsolutePath() + " ! " + e.getMessage(), e);
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("Instance: error while loading " + xml.getAbsolutePath() + " ! " + e);
+			_log.log(Level.WARNING, "Instance: error while loading " + xml.getAbsolutePath() + " ! " + e.getMessage(), e);
 		}
 		}
 	}
 	}
 
 
@@ -492,7 +493,7 @@ public class Instance
 				}
 				}
 				catch (Exception e)
 				catch (Exception e)
 				{
 				{
-					_log.warning("Error parsing instance xml: " + e);
+					_log.log(Level.WARNING, "Error parsing instance xml: " + e.getMessage(), e);
 					_spawnLoc = new int[3];
 					_spawnLoc = new int[3];
 				}
 				}
 			}
 			}

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/entity/L2Event.java

@@ -255,7 +255,7 @@ public class L2Event
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("error when signing in the event:" + e);
+			_log.log(Level.WARNING, "Error when signing in the event:" + e.getMessage(), e);
 		}
 		}
 	}
 	}
 	
 	

+ 3 - 2
L2_GameServer/java/com/l2jserver/gameserver/model/entity/TvTEvent.java

@@ -16,6 +16,7 @@ package com.l2jserver.gameserver.model.entity;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
 import com.l2jserver.Config;
 import com.l2jserver.Config;
@@ -135,7 +136,7 @@ public class TvTEvent
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("TvTEventEngine[TvTEvent.startParticipation()]: exception: " + e);
+			_log.log(Level.WARNING, "TvTEventEngine[TvTEvent.startParticipation()]: exception: " + e.getMessage(), e);
 			return false;
 			return false;
 		}
 		}
 		
 		
@@ -228,7 +229,7 @@ public class TvTEvent
 			catch (Exception e)
 			catch (Exception e)
 			{
 			{
 				_TvTEventInstance = 0;
 				_TvTEventInstance = 0;
-				_log.warning("TvTEventEngine[TvTEvent.createDynamicInstance]: exception: " + e);
+				_log.log(Level.WARNING, "TvTEventEngine[TvTEvent.createDynamicInstance]: exception: " + e.getMessage(), e);
 			}
 			}
 		}
 		}
 
 

+ 2 - 2
L2_GameServer/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java

@@ -667,10 +667,10 @@ public class PcInventory extends Inventory
             statement2.close();
             statement2.close();
         }
         }
         catch (Exception e) {
         catch (Exception e) {
-			_log.log(Level.WARNING, "could not restore inventory:", e);
+			_log.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e);
         }
         }
         finally {
         finally {
-            try { con.close(); } catch (Exception e) { _log.warning(""); }
+            try { con.close(); } catch (Exception e) {}
         }
         }
         return paperdoll;
         return paperdoll;
     }
     }

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/quest/QuestState.java

@@ -532,7 +532,7 @@ public final class QuestState
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.finer(getPlayer().getName() + ": variable " + var + " isn't an integer: " + varint + e);
+			_log.log(Level.FINER, getPlayer().getName() + ": variable " + var + " isn't an integer: " + varint + " ! " + e.getMessage(), e);
 			//	    if (Config.AUTODELETE_INVALID_QUEST_DATA)
 			//	    if (Config.AUTODELETE_INVALID_QUEST_DATA)
 			//		exitQuest(true);
 			//		exitQuest(true);
 		}
 		}

+ 2 - 1
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerFriendInvite.java

@@ -16,6 +16,7 @@ package com.l2jserver.gameserver.network.clientpackets;
 
 
 import java.sql.Connection;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.PreparedStatement;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.L2DatabaseFactory;
@@ -91,7 +92,7 @@ public final class RequestAnswerFriendInvite extends L2GameClientPacket
         		}
         		}
         		catch (Exception e)
         		catch (Exception e)
         		{
         		{
-        		    _log.warning("could not add friend objectid: "+ e);
+        		    _log.log(Level.WARNING, "Could not add friend objectid: "+ e.getMessage(), e);
         		}
         		}
         		finally
         		finally
         		{
         		{

+ 2 - 1
L2_GameServer/java/com/l2jserver/gameserver/network/communityserver/readpackets/RequestWorldInfo.java

@@ -17,6 +17,7 @@ package com.l2jserver.gameserver.network.communityserver.readpackets;
 import java.sql.Connection;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSet;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
 import org.netcon.BaseReadPacket;
 import org.netcon.BaseReadPacket;
@@ -119,7 +120,7 @@ public final class RequestWorldInfo extends BaseReadPacket
 				}
 				}
 				catch (Exception e)
 				catch (Exception e)
 				{
 				{
-					_log.warning("Could not restore char info: " + e.getMessage());
+					_log.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e);
 				}
 				}
 				finally
 				finally
 				{
 				{

+ 4 - 3
L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java

@@ -18,6 +18,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSet;
 import java.util.List;
 import java.util.List;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.L2DatabaseFactory;
@@ -222,7 +223,7 @@ public class CharSelectionInfo extends L2GameServerPacket
         }
         }
         catch (Exception e)
         catch (Exception e)
         {
         {
-            _log.warning("Could not restore char info: " + e);
+            _log.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e);
         }
         }
         finally
         finally
         {
         {
@@ -257,7 +258,7 @@ public class CharSelectionInfo extends L2GameServerPacket
         }
         }
         catch (Exception e)
         catch (Exception e)
         {
         {
-            _log.warning("Could not restore char subclass info: " + e);
+            _log.log(Level.WARNING, "Could not restore char subclass info: " + e.getMessage(), e);
         }
         }
         finally
         finally
         {
         {
@@ -363,7 +364,7 @@ public class CharSelectionInfo extends L2GameServerPacket
             }
             }
             catch (Exception e)
             catch (Exception e)
             {
             {
-                _log.warning("Could not restore augmentation info: " + e);
+                _log.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e);
             }
             }
             finally { try { con.close(); } catch (Exception e) {} }
             finally { try { con.close(); } catch (Exception e) {} }
         }
         }

+ 2 - 1
L2_GameServer/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellPathFinding.java

@@ -17,6 +17,7 @@ package com.l2jserver.gameserver.pathfinding.cellnodes;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.ListIterator;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
 import javolution.util.FastList;
 import javolution.util.FastList;
@@ -78,7 +79,7 @@ public class CellPathFinding extends PathFinding
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("CellPathFinding: Problem during buffer init: " + e.getMessage());
+			_log.log(Level.WARNING, "CellPathFinding: Problem during buffer init: " + e.getMessage(), e);
 			throw new Error("CellPathFinding: load aborted");
 			throw new Error("CellPathFinding: load aborted");
 		}
 		}
 	}
 	}

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/script/faenor/FaenorEventParser.java

@@ -136,7 +136,7 @@ public class FaenorEventParser extends FaenorParser
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("ERROR(parseEventDrop):" + e.getMessage());
+			_log.log(Level.WARNING, "ERROR(parseEventDrop):" + e.getMessage(), e);
 		}
 		}
 	}
 	}
 	
 	

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/script/faenor/FaenorWorldDataParser.java

@@ -116,7 +116,7 @@ public class FaenorWorldDataParser extends FaenorParser
         catch (Exception e)
         catch (Exception e)
         {
         {
             petData.petId = -1;
             petData.petId = -1;
-            _log.warning("ERROR(parseStat):" + e.getMessage());
+            _log.log(Level.WARNING, "ERROR(parseStat):" + e.getMessage(), e);
         }
         }
     }
     }
 
 

+ 2 - 2
L2_GameServer/java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java

@@ -595,8 +595,8 @@ public final class L2ScriptEngineManager
 		}
 		}
 		else
 		else
 		{
 		{
-			_log.warning("Failed executing script: " + script.getAbsolutePath() + "\r\n" + e.getMessage()
-					+ "Additionally failed when trying to write an error report on script directory.");
+			_log.log(Level.WARNING, "Failed executing script: " + script.getAbsolutePath() + "\r\n" + e.getMessage()
+					+ "Additionally failed when trying to write an error report on script directory.", e);
 		}
 		}
 	}
 	}
 	
 	

+ 5 - 3
L2_GameServer/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSiegeFlag.java

@@ -14,6 +14,8 @@
  */
  */
 package com.l2jserver.gameserver.skills.l2skills;
 package com.l2jserver.gameserver.skills.l2skills;
 
 
+import java.util.logging.Level;
+
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
@@ -77,8 +79,8 @@ public class L2SkillSiegeFlag extends L2Skill
 			}
 			}
 			catch (Exception e)
 			catch (Exception e)
 			{
 			{
-				player.sendMessage("Error placing flag:" + e);
-				_log.warning("Error placing flag:" + e);
+				player.sendMessage("Error placing flag: " + e);
+				_log.log(Level.WARNING, "Error placing flag: " + e.getMessage(), e);
 			}
 			}
 			return;
 			return;
 		}
 		}
@@ -102,7 +104,7 @@ public class L2SkillSiegeFlag extends L2Skill
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
 			player.sendMessage("Error placing flag:" + e);
 			player.sendMessage("Error placing flag:" + e);
-			_log.warning("Error placing flag:" + e);
+			_log.log(Level.WARNING, "Error placing flag: " + e.getMessage(), e);
 		}
 		}
 	}
 	}
 	
 	

+ 3 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSpawn.java

@@ -14,6 +14,8 @@
  */
  */
 package com.l2jserver.gameserver.skills.l2skills;
 package com.l2jserver.gameserver.skills.l2skills;
 
 
+import java.util.logging.Level;
+
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2Skill;
@@ -84,7 +86,7 @@ public class L2SkillSpawn extends L2Skill
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("Exception while spawning NPC ID:"+_npcId+", skill ID:"+this.getId()+","+e);
+			_log.log(Level.WARNING, "Exception while spawning NPC ID: " + _npcId + ", skill ID: " + this.getId() + ", exception: " + e.getMessage(), e);
 		}
 		}
 	}
 	}
 }
 }

+ 4 - 4
L2_GameServer/java/com/l2jserver/gameserver/taskmanager/TaskManager.java

@@ -97,7 +97,7 @@ public final class TaskManager
 			}
 			}
 			catch (SQLException e)
 			catch (SQLException e)
 			{
 			{
-				_log.warning("cannot updated the Global Task " + id + ": " + e.getMessage());
+				_log.log(Level.WARNING, "Cannot updated the Global Task " + id + ": " + e.getMessage(), e);
 			}
 			}
 			finally
 			finally
 			{
 			{
@@ -306,7 +306,7 @@ public final class TaskManager
 				}
 				}
 				catch (Exception e)
 				catch (Exception e)
 				{
 				{
-					_log.warning("Bad parameter on task " + task.getId() + ": " + e.getMessage());
+					_log.log(Level.WARNING, "Bad parameter on task " + task.getId() + ": " + e.getMessage(), e);
 					return false;
 					return false;
 				}
 				}
 				
 				
@@ -363,7 +363,7 @@ public final class TaskManager
 		}
 		}
 		catch (SQLException e)
 		catch (SQLException e)
 		{
 		{
-			_log.warning("cannot add the unique task: " + e.getMessage());
+			_log.log(Level.WARNING, "Cannot add the unique task: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -405,7 +405,7 @@ public final class TaskManager
 		}
 		}
 		catch (SQLException e)
 		catch (SQLException e)
 		{
 		{
-			_log.warning("cannot add the task:  " + e.getMessage());
+			_log.log(Level.WARNING, "Cannot add the task:  " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{

+ 2 - 2
L2_GameServer/java/com/l2jserver/gameserver/taskmanager/tasks/TaskSevenSignsUpdate.java

@@ -14,6 +14,7 @@
  */
  */
 package com.l2jserver.gameserver.taskmanager.tasks;
 package com.l2jserver.gameserver.taskmanager.tasks;
 
 
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
 import com.l2jserver.gameserver.SevenSigns;
 import com.l2jserver.gameserver.SevenSigns;
@@ -63,8 +64,7 @@ public class TaskSevenSignsUpdate extends Task
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("SevenSigns: Failed to save Seven Signs configuration: "
-			        + e);
+			_log.log(Level.WARNING, "SevenSigns: Failed to save Seven Signs configuration: " + e.getMessage(), e);
 		}
 		}
 	}
 	}
 	
 	

+ 3 - 4
L2_GameServer/java/com/l2jserver/gameserver/templates/effects/EffectTemplate.java

@@ -16,6 +16,7 @@ package com.l2jserver.gameserver.templates.effects;
 
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.InvocationTargetException;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
 import com.l2jserver.gameserver.model.ChanceCondition;
 import com.l2jserver.gameserver.model.ChanceCondition;
@@ -122,8 +123,7 @@ public class EffectTemplate
 		}
 		}
 		catch (InvocationTargetException e)
 		catch (InvocationTargetException e)
 		{
 		{
-			_log.warning("Error creating new instance of Class " + _func + " Exception was:");
-			e.getTargetException().printStackTrace();
+			_log.log(Level.WARNING, "Error creating new instance of Class " + _func + " Exception was: " + e.getTargetException().getMessage(), e.getTargetException());
 			return null;
 			return null;
 		}
 		}
 		
 		
@@ -176,8 +176,7 @@ public class EffectTemplate
 		}
 		}
 		catch (InvocationTargetException e)
 		catch (InvocationTargetException e)
 		{
 		{
-			_log.warning("Error creating new instance of Class " + func + " Exception was:");
-			e.getTargetException().printStackTrace();
+			_log.log(Level.WARNING, "Error creating new instance of Class " + func + " Exception was: " + e.getTargetException().getMessage(), e.getTargetException());
 			return null;
 			return null;
 		}
 		}
 	}
 	}

+ 7 - 6
L2_GameServer/java/com/l2jserver/loginserver/LoginController.java

@@ -26,6 +26,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Map;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
 import javax.crypto.Cipher;
 import javax.crypto.Cipher;
@@ -426,7 +427,7 @@ public class LoginController
 				}
 				}
 				catch (Exception e)
 				catch (Exception e)
 				{
 				{
-					_log.warning("Could not set lastServer: " + e);
+					_log.log(Level.WARNING, "Could not set lastServer: " + e.getMessage(), e);
 				}
 				}
 				finally
 				finally
 				{
 				{
@@ -461,7 +462,7 @@ public class LoginController
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("Could not set accessLevel: " + e);
+			_log.log(Level.WARNING, "Could not set accessLevel: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -497,7 +498,7 @@ public class LoginController
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("Could not set last tracert: " + e);
+			_log.log(Level.WARNING, "Could not set last tracert: " + e.getMessage(), e);
 		}
 		}
 		finally
 		finally
 		{
 		{
@@ -535,7 +536,7 @@ public class LoginController
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("could not check gm state:" + e);
+			_log.log(Level.WARNING, "Could not check gm state:" + e.getMessage(), e);
 			ok = false;
 			ok = false;
 		}
 		}
 		finally
 		finally
@@ -710,7 +711,7 @@ public class LoginController
 		}
 		}
 		catch (Exception e)
 		catch (Exception e)
 		{
 		{
-			_log.warning("Could not check password:" + e);
+			_log.log(Level.WARNING, "Could not check password:" + e.getMessage(), e);
 			ok = false;
 			ok = false;
 		}
 		}
 		finally
 		finally
@@ -783,7 +784,7 @@ public class LoginController
 		{
 		{
 			// digest algo not found ??
 			// digest algo not found ??
 			// out of bounds should not be possible
 			// out of bounds should not be possible
-			_log.warning("could not check ban state:" + e);
+			_log.log(Level.WARNING, "Could not check ban state:" + e.getMessage(), e);
 			ok = false;
 			ok = false;
 		}
 		}
 		finally
 		finally