Browse Source

Removing printStackTrace

Zoey76 9 năm trước cách đây
mục cha
commit
63bba38c4b

+ 1 - 5
build.gradle

@@ -36,8 +36,4 @@ task zip(type: Zip) {
 	println 'Build in build/distributions/' + fileName + '.zip'
 }
 
-build.finalizedBy(zip)
-
-task wrapper(type: Wrapper) {
-	gradleVersion = '2.6-rc-1'
-}
+build.finalizedBy(zip)

+ 1 - 1
dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java

@@ -245,7 +245,7 @@ public class TarBeetleSpawn implements IXmlReader
 			}
 			catch (Exception e)
 			{
-				e.printStackTrace();
+				LOGGER.warn("{}: Could not refresh spawns!", getClass().getSimpleName(), e);
 			}
 		}
 		

+ 1 - 2
dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java

@@ -86,8 +86,7 @@ public final class FortressOfResistance extends ClanHallSiegeEngine
 		}
 		catch (Exception e)
 		{
-			_log.warning(getName() + ": Couldnt set the Bloody Lord Nurka spawn");
-			e.printStackTrace();
+			_log.warn("{}: Couldnt set the Bloody Lord Nurka spawn!", getName(), e);
 		}
 	}
 	

+ 10 - 12
dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java

@@ -294,7 +294,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
 			}
 			else
 			{
-				_log.warning("CHSiegeManager: No Date setted for RainBow Springs Chateau Clan hall siege!. SIEGE CANCELED!");
+				_log.warn("CHSiegeManager: No Date setted for RainBow Springs Chateau Clan hall siege!. SIEGE CANCELED!");
 			}
 		}
 	}
@@ -685,7 +685,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
 	{
 		if ((arena < 0) || (arena > 3))
 		{
-			_log.warning("RainbowSptringChateau siege: Wrong arena id passed: " + arena);
+			_log.warn("RainbowSptringChateau siege: Wrong arena ID passed {}!", arena);
 			return;
 		}
 		for (L2PcInstance pc : leader.getParty().getMembers())
@@ -719,7 +719,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
 				}
 				catch (Exception e)
 				{
-					e.printStackTrace();
+					_log.warn("Unable to spawn guard for clan index {}!", i, e);
 				}
 			}
 			SpawnTable.getInstance().addNewSpawn(_gourds[i], false);
@@ -840,7 +840,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
 		}
 		catch (Exception e)
 		{
-			e.printStackTrace();
+			_log.warn("{}: Unable to remove attacker clan ID {} from database!", RainbowSpringsChateau.class.getSigners(), clanId, e);
 		}
 	}
 	
@@ -855,7 +855,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
 		}
 		catch (Exception e)
 		{
-			e.printStackTrace();
+			_log.warn("{}: Unable add attakers for clan ID {} and count {}!", RainbowSpringsChateau.class.getSigners(), clanId, count, e);
 		}
 	}
 	
@@ -863,19 +863,17 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
 	public void loadAttackers()
 	{
 		try (Connection con = ConnectionFactory.getInstance().getConnection();
-			Statement s = con.createStatement())
+			Statement s = con.createStatement();
+			ResultSet rset = s.executeQuery("SELECT * FROM rainbowsprings_attacker_list"))
 		{
-			try (ResultSet rset = s.executeQuery("SELECT * FROM rainbowsprings_attacker_list"))
+			while (rset.next())
 			{
-				while (rset.next())
-				{
-					_warDecreesCount.put(rset.getInt("clan_id"), rset.getLong("decrees_count"));
-				}
+				_warDecreesCount.put(rset.getInt("clan_id"), rset.getLong("decrees_count"));
 			}
 		}
 		catch (Exception e)
 		{
-			e.printStackTrace();
+			_log.warn("{}: Unable load attakers!", RainbowSpringsChateau.class.getSigners(), e);
 		}
 	}
 	

+ 12 - 14
dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java

@@ -251,7 +251,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 					}
 					catch (Exception e)
 					{
-						_log.warning(getName() + "->select_clan_npc->Wrong mahum warrior id: " + var[1]);
+						_log.warn("{}: select_clan_npc->Wrong mahum warrior ID {}!", getName(), var[1], e);
 					}
 					if ((id > 0) && ((html = getAllyHtml(id)) != null))
 					{
@@ -261,7 +261,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 				}
 				else
 				{
-					_log.warning(getName() + " Siege: Not enough parameters to save clan npc for clan: " + clan.getName());
+					_log.warn("{}: Siege: Not enough parameters to save clan npc for clan {}! ", getName(), clan.getName());
 				}
 			}
 		}
@@ -546,8 +546,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 			catch (Exception e)
 			{
 				endSiege();
-				_log.warning(getName() + ": Problems in siege initialization!");
-				e.printStackTrace();
+				_log.warn("{}: Problems in siege initialization!", getName(), e);
 			}
 		}
 	}
@@ -653,8 +652,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 		catch (Exception e)
 		{
-			_log.warning(getName() + ": Couldnt make clan spawns: " + e.getMessage());
-			e.printStackTrace();
+			_log.warn("{}: Could not make clan spawns!", getName(), e);
 		}
 	}
 	
@@ -776,7 +774,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 					
 					if (ClanTable.getInstance().getClan(clanId) == null)
 					{
-						_log.warning(getName() + ": Loaded an unexistent clan as attacker! Clan ID: " + clanId);
+						_log.warn("{}: Loaded an unexistent clan as attacker! Clan ID {}!", getName(), clanId);
 						continue;
 					}
 					
@@ -791,7 +789,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 		catch (Exception e)
 		{
-			_log.warning(getName() + ".loadAttackers()->" + e.getMessage());
+			_log.warn("Could not load attackers for {}!", getName(), e);
 		}
 	}
 	
@@ -800,7 +798,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		final List<Integer> listInstance = _data.get(clanId).players;
 		if (listInstance == null)
 		{
-			_log.warning(getName() + ": Tried to load unregistered clan with ID " + clanId);
+			_log.warn(getName() + ": Tried to load unregistered clan with ID " + clanId);
 			return;
 		}
 		
@@ -818,7 +816,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 		catch (Exception e)
 		{
-			_log.warning(getName() + ".loadAttackerMembers()->" + e.getMessage());
+			_log.warn("{}: loadAttackerMembers", getName(), e);
 		}
 	}
 	
@@ -835,7 +833,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 		catch (Exception e)
 		{
-			_log.warning(getName() + ".saveClan()->" + e.getMessage());
+			_log.warn("{}: saveClan", getName(), e);
 		}
 	}
 	
@@ -850,7 +848,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 		catch (Exception e)
 		{
-			_log.warning(getName() + ".saveNpc()->" + e.getMessage());
+			_log.warn("{}: saveNpc()", getName(), e);
 		}
 	}
 	
@@ -866,7 +864,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 		catch (Exception e)
 		{
-			_log.warning(getName() + ".saveMember()->" + e.getMessage());
+			_log.warn("{}: saveMember", getName(), e);
 		}
 	}
 	
@@ -884,7 +882,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 		catch (Exception e)
 		{
-			_log.warning(getName() + ".clearTables()->" + e.getMessage());
+			_log.warn("Unable to clear data tables for {}!", getName(), e);
 		}
 	}
 	

+ 7 - 9
dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java

@@ -23,7 +23,9 @@ import java.net.Socket;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
 
-import com.l2jserver.Config;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
 import com.l2jserver.gameserver.handler.ITelnetHandler;
 import com.l2jserver.gameserver.instancemanager.PunishmentManager;
@@ -48,6 +50,8 @@ import com.l2jserver.gameserver.util.Util;
  */
 public class PlayerHandler implements ITelnetHandler
 {
+	private static final Logger LOGGER = LoggerFactory.getLogger(PlayerHandler.class);
+	
 	private final String[] _commands =
 	{
 		"kick",
@@ -245,10 +249,7 @@ public class PlayerHandler implements ITelnetHandler
 			}
 			catch (Exception e)
 			{
-				if (Config.DEBUG)
-				{
-					e.printStackTrace();
-				}
+				LOGGER.debug("Could not jail player via telnet!", e);
 			}
 		}
 		else if (command.startsWith("unjail"))
@@ -275,10 +276,7 @@ public class PlayerHandler implements ITelnetHandler
 			}
 			catch (Exception e)
 			{
-				if (Config.DEBUG)
-				{
-					e.printStackTrace();
-				}
+				LOGGER.debug("Could not unjail player via telnet!", e);
 			}
 		}
 		return false;