Removed static log constants.

This commit is contained in:
MobiusDev
2018-04-30 21:51:57 +00:00
parent f699e2653c
commit 8a21c2c232
23 changed files with 39 additions and 111 deletions

View File

@@ -14,7 +14,7 @@ echo Possible reasons for this to happen:
echo. echo.
echo - Missing .jar files or ../libs directory. echo - Missing .jar files or ../libs directory.
echo - MySQL server not running or incorrect MySQL settings: echo - MySQL server not running or incorrect MySQL settings:
echo check ./config/loginserver.properties echo check ./config/loginserver.ini
echo - Wrong data types or values out of range were provided: echo - Wrong data types or values out of range were provided:
echo specify correct values for each required field echo specify correct values for each required field
echo. echo.

View File

@@ -151,10 +151,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName());
// Local Constants
private static final String LOG_FOLDER = "log"; // Name of folder for log file
private static final String LOG_NAME = "./log.cfg"; // Name of log file
private final DeadLockDetector _deadDetectThread; private final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
@@ -459,11 +455,11 @@ public class GameServer
/*** Main ***/ /*** Main ***/
// Create log folder // Create log folder
final File logFolder = new File(Config.DATAPACK_ROOT, LOG_FOLDER); final File logFolder = new File(Config.DATAPACK_ROOT, "log");
logFolder.mkdir(); logFolder.mkdir();
// Create input stream for log file -- or store file data into memory // Create input stream for log file -- or store file data into memory
try (InputStream is = new FileInputStream(new File(LOG_NAME))) try (InputStream is = new FileInputStream(new File("./log.cfg")))
{ {
LogManager.getLogManager().readConfiguration(is); LogManager.getLogManager().readConfiguration(is);
} }

View File

@@ -60,18 +60,13 @@ public final class LoginServer
_instance = this; _instance = this;
Server.serverMode = Server.MODE_LOGINSERVER; Server.serverMode = Server.MODE_LOGINSERVER;
// Local Constants
final String LOG_FOLDER = "log"; // Name of folder for log file
final String LOG_NAME = "./log.cfg"; // Name of log file
/*** Main ***/
// Create log folder // Create log folder
final File logFolder = new File(".", LOG_FOLDER); final File logFolder = new File(".", "log");
logFolder.mkdir(); logFolder.mkdir();
// Create input stream for log file -- or store file data into memory // Create input stream for log file -- or store file data into memory
try (InputStream is = new FileInputStream(new File(LOG_NAME))) try (InputStream is = new FileInputStream(new File("./log.cfg")))
{ {
LogManager.getLogManager().readConfiguration(is); LogManager.getLogManager().readConfiguration(is);
} }

View File

@@ -14,7 +14,7 @@ echo Possible reasons for this to happen:
echo. echo.
echo - Missing .jar files or ../libs directory. echo - Missing .jar files or ../libs directory.
echo - MySQL server not running or incorrect MySQL settings: echo - MySQL server not running or incorrect MySQL settings:
echo check ./config/loginserver.properties echo check ./config/loginserver.ini
echo - Wrong data types or values out of range were provided: echo - Wrong data types or values out of range were provided:
echo specify correct values for each required field echo specify correct values for each required field
echo. echo.

View File

@@ -155,10 +155,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName());
// Local Constants
private static final String LOG_FOLDER = "log"; // Name of folder for log file
private static final String LOG_NAME = "./log.cfg"; // Name of log file
private final DeadLockDetector _deadDetectThread; private final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
@@ -467,11 +463,11 @@ public class GameServer
/*** Main ***/ /*** Main ***/
// Create log folder // Create log folder
final File logFolder = new File(Config.DATAPACK_ROOT, LOG_FOLDER); final File logFolder = new File(Config.DATAPACK_ROOT, "log");
logFolder.mkdir(); logFolder.mkdir();
// Create input stream for log file -- or store file data into memory // Create input stream for log file -- or store file data into memory
try (InputStream is = new FileInputStream(new File(LOG_NAME))) try (InputStream is = new FileInputStream(new File("./log.cfg")))
{ {
LogManager.getLogManager().readConfiguration(is); LogManager.getLogManager().readConfiguration(is);
} }

View File

@@ -60,18 +60,13 @@ public final class LoginServer
_instance = this; _instance = this;
Server.serverMode = Server.MODE_LOGINSERVER; Server.serverMode = Server.MODE_LOGINSERVER;
// Local Constants
final String LOG_FOLDER = "log"; // Name of folder for log file
final String LOG_NAME = "./log.cfg"; // Name of log file
/*** Main ***/
// Create log folder // Create log folder
final File logFolder = new File(".", LOG_FOLDER); final File logFolder = new File(".", "log");
logFolder.mkdir(); logFolder.mkdir();
// Create input stream for log file -- or store file data into memory // Create input stream for log file -- or store file data into memory
try (InputStream is = new FileInputStream(new File(LOG_NAME))) try (InputStream is = new FileInputStream(new File("./log.cfg")))
{ {
LogManager.getLogManager().readConfiguration(is); LogManager.getLogManager().readConfiguration(is);
} }

View File

@@ -14,7 +14,7 @@ echo Possible reasons for this to happen:
echo. echo.
echo - Missing .jar files or ../libs directory. echo - Missing .jar files or ../libs directory.
echo - MySQL server not running or incorrect MySQL settings: echo - MySQL server not running or incorrect MySQL settings:
echo check ./config/loginserver.properties echo check ./config/loginserver.ini
echo - Wrong data types or values out of range were provided: echo - Wrong data types or values out of range were provided:
echo specify correct values for each required field echo specify correct values for each required field
echo. echo.

View File

@@ -155,10 +155,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName());
// Local Constants
private static final String LOG_FOLDER = "log"; // Name of folder for log file
private static final String LOG_NAME = "./log.cfg"; // Name of log file
private final DeadLockDetector _deadDetectThread; private final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
@@ -467,11 +463,11 @@ public class GameServer
/*** Main ***/ /*** Main ***/
// Create log folder // Create log folder
final File logFolder = new File(Config.DATAPACK_ROOT, LOG_FOLDER); final File logFolder = new File(Config.DATAPACK_ROOT, "log");
logFolder.mkdir(); logFolder.mkdir();
// Create input stream for log file -- or store file data into memory // Create input stream for log file -- or store file data into memory
try (InputStream is = new FileInputStream(new File(LOG_NAME))) try (InputStream is = new FileInputStream(new File("./log.cfg")))
{ {
LogManager.getLogManager().readConfiguration(is); LogManager.getLogManager().readConfiguration(is);
} }

View File

@@ -60,18 +60,13 @@ public final class LoginServer
_instance = this; _instance = this;
Server.serverMode = Server.MODE_LOGINSERVER; Server.serverMode = Server.MODE_LOGINSERVER;
// Local Constants
final String LOG_FOLDER = "log"; // Name of folder for log file
final String LOG_NAME = "./log.cfg"; // Name of log file
/*** Main ***/
// Create log folder // Create log folder
final File logFolder = new File(".", LOG_FOLDER); final File logFolder = new File(".", "log");
logFolder.mkdir(); logFolder.mkdir();
// Create input stream for log file -- or store file data into memory // Create input stream for log file -- or store file data into memory
try (InputStream is = new FileInputStream(new File(LOG_NAME))) try (InputStream is = new FileInputStream(new File("./log.cfg")))
{ {
LogManager.getLogManager().readConfiguration(is); LogManager.getLogManager().readConfiguration(is);
} }

View File

@@ -14,7 +14,7 @@ echo Possible reasons for this to happen:
echo. echo.
echo - Missing .jar files or ../libs directory. echo - Missing .jar files or ../libs directory.
echo - MySQL server not running or incorrect MySQL settings: echo - MySQL server not running or incorrect MySQL settings:
echo check ./config/loginserver.properties echo check ./config/loginserver.ini
echo - Wrong data types or values out of range were provided: echo - Wrong data types or values out of range were provided:
echo specify correct values for each required field echo specify correct values for each required field
echo. echo.

View File

@@ -155,10 +155,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName());
// Local Constants
private static final String LOG_FOLDER = "log"; // Name of folder for log file
private static final String LOG_NAME = "./log.cfg"; // Name of log file
private final DeadLockDetector _deadDetectThread; private final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
@@ -467,11 +463,11 @@ public class GameServer
/*** Main ***/ /*** Main ***/
// Create log folder // Create log folder
final File logFolder = new File(Config.DATAPACK_ROOT, LOG_FOLDER); final File logFolder = new File(Config.DATAPACK_ROOT, "log");
logFolder.mkdir(); logFolder.mkdir();
// Create input stream for log file -- or store file data into memory // Create input stream for log file -- or store file data into memory
try (InputStream is = new FileInputStream(new File(LOG_NAME))) try (InputStream is = new FileInputStream(new File("./log.cfg")))
{ {
LogManager.getLogManager().readConfiguration(is); LogManager.getLogManager().readConfiguration(is);
} }

View File

@@ -60,18 +60,13 @@ public final class LoginServer
_instance = this; _instance = this;
Server.serverMode = Server.MODE_LOGINSERVER; Server.serverMode = Server.MODE_LOGINSERVER;
// Local Constants
final String LOG_FOLDER = "log"; // Name of folder for log file
final String LOG_NAME = "./log.cfg"; // Name of log file
/*** Main ***/
// Create log folder // Create log folder
final File logFolder = new File(".", LOG_FOLDER); final File logFolder = new File(".", "log");
logFolder.mkdir(); logFolder.mkdir();
// Create input stream for log file -- or store file data into memory // Create input stream for log file -- or store file data into memory
try (InputStream is = new FileInputStream(new File(LOG_NAME))) try (InputStream is = new FileInputStream(new File("./log.cfg")))
{ {
LogManager.getLogManager().readConfiguration(is); LogManager.getLogManager().readConfiguration(is);
} }

View File

@@ -147,10 +147,6 @@ public class GameServer
{ {
private static Logger LOGGER = Logger.getLogger(GameServer.class.getName()); private static Logger LOGGER = Logger.getLogger(GameServer.class.getName());
// Local Constants
private static final String LOG_FOLDER = "log"; // Name of folder for log file
private static final String LOG_NAME = "./log.cfg"; // Name of log file
private static SelectorThread<L2GameClient> _selectorThread; private static SelectorThread<L2GameClient> _selectorThread;
private static LoginServerThread _loginThread; private static LoginServerThread _loginThread;
private static L2GamePacketHandler _gamePacketHandler; private static L2GamePacketHandler _gamePacketHandler;
@@ -163,11 +159,11 @@ public class GameServer
Server.serverMode = Server.MODE_GAMESERVER; Server.serverMode = Server.MODE_GAMESERVER;
// Create log folder // Create log folder
final File logFolder = new File(Config.DATAPACK_ROOT, LOG_FOLDER); final File logFolder = new File(Config.DATAPACK_ROOT, "log");
logFolder.mkdir(); logFolder.mkdir();
// Create input stream for log file -- or store file data into memory // Create input stream for log file -- or store file data into memory
try (InputStream is = new FileInputStream(new File(LOG_NAME))) try (InputStream is = new FileInputStream(new File("./log.cfg")))
{ {
LogManager.getLogManager().readConfiguration(is); LogManager.getLogManager().readConfiguration(is);
} }

View File

@@ -61,18 +61,14 @@ public class LoginServer
{ {
_instance = this; _instance = this;
Server.serverMode = Server.MODE_LOGINSERVER; Server.serverMode = Server.MODE_LOGINSERVER;
// Local Constants
final String LOG_FOLDER = "log"; // Name of folder for log file
final String LOG_NAME = "./log.cfg"; // Name of log file
/*** Main ***/
// Create log folder // Create log folder
final File logFolder = new File(".", LOG_FOLDER); final File logFolder = new File(".", "log");
logFolder.mkdir(); logFolder.mkdir();
// Create input stream for log file -- or store file data into memory // Create input stream for log file -- or store file data into memory
try (InputStream is = new FileInputStream(new File(LOG_NAME))) try (InputStream is = new FileInputStream(new File("./log.cfg")))
{ {
LogManager.getLogManager().readConfiguration(is); LogManager.getLogManager().readConfiguration(is);
} }

View File

@@ -14,7 +14,7 @@ echo Possible reasons for this to happen:
echo. echo.
echo - Missing .jar files or ../libs directory. echo - Missing .jar files or ../libs directory.
echo - MySQL server not running or incorrect MySQL settings: echo - MySQL server not running or incorrect MySQL settings:
echo check ./config/loginserver.properties echo check ./config/loginserver.ini
echo - Wrong data types or values out of range were provided: echo - Wrong data types or values out of range were provided:
echo specify correct values for each required field echo specify correct values for each required field
echo. echo.

View File

@@ -148,10 +148,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName());
// Local Constants
private static final String LOG_FOLDER = "log"; // Name of folder for log file
private static final String LOG_NAME = "./log.cfg"; // Name of log file
private final DeadLockDetector _deadDetectThread; private final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
@@ -462,13 +458,12 @@ public class GameServer
{ {
Server.serverMode = Server.MODE_GAMESERVER; Server.serverMode = Server.MODE_GAMESERVER;
/*** Main ***/
// Create log folder // Create log folder
final File logFolder = new File(Config.DATAPACK_ROOT, LOG_FOLDER); final File logFolder = new File(Config.DATAPACK_ROOT, "log");
logFolder.mkdir(); logFolder.mkdir();
// Create input stream for log file -- or store file data into memory // Create input stream for log file -- or store file data into memory
try (InputStream is = new FileInputStream(new File(LOG_NAME))) try (InputStream is = new FileInputStream(new File("./log.cfg")))
{ {
LogManager.getLogManager().readConfiguration(is); LogManager.getLogManager().readConfiguration(is);
} }

View File

@@ -60,18 +60,13 @@ public final class LoginServer
_instance = this; _instance = this;
Server.serverMode = Server.MODE_LOGINSERVER; Server.serverMode = Server.MODE_LOGINSERVER;
// Local Constants
final String LOG_FOLDER = "log"; // Name of folder for log file
final String LOG_NAME = "./log.cfg"; // Name of log file
/*** Main ***/
// Create log folder // Create log folder
final File logFolder = new File(".", LOG_FOLDER); final File logFolder = new File(".", "log");
logFolder.mkdir(); logFolder.mkdir();
// Create input stream for log file -- or store file data into memory // Create input stream for log file -- or store file data into memory
try (InputStream is = new FileInputStream(new File(LOG_NAME))) try (InputStream is = new FileInputStream(new File("./log.cfg")))
{ {
LogManager.getLogManager().readConfiguration(is); LogManager.getLogManager().readConfiguration(is);
} }

View File

@@ -14,7 +14,7 @@ echo Possible reasons for this to happen:
echo. echo.
echo - Missing .jar files or ../libs directory. echo - Missing .jar files or ../libs directory.
echo - MySQL server not running or incorrect MySQL settings: echo - MySQL server not running or incorrect MySQL settings:
echo check ./config/loginserver.properties echo check ./config/loginserver.ini
echo - Wrong data types or values out of range were provided: echo - Wrong data types or values out of range were provided:
echo specify correct values for each required field echo specify correct values for each required field
echo. echo.

View File

@@ -151,10 +151,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName());
// Local Constants
private static final String LOG_FOLDER = "log"; // Name of folder for log file
private static final String LOG_NAME = "./log.cfg"; // Name of log file
private final DeadLockDetector _deadDetectThread; private final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
@@ -458,11 +454,11 @@ public class GameServer
/*** Main ***/ /*** Main ***/
// Create log folder // Create log folder
final File logFolder = new File(Config.DATAPACK_ROOT, LOG_FOLDER); final File logFolder = new File(Config.DATAPACK_ROOT, "log");
logFolder.mkdir(); logFolder.mkdir();
// Create input stream for log file -- or store file data into memory // Create input stream for log file -- or store file data into memory
try (InputStream is = new FileInputStream(new File(LOG_NAME))) try (InputStream is = new FileInputStream(new File("./log.cfg")))
{ {
LogManager.getLogManager().readConfiguration(is); LogManager.getLogManager().readConfiguration(is);
} }

View File

@@ -60,18 +60,13 @@ public final class LoginServer
_instance = this; _instance = this;
Server.serverMode = Server.MODE_LOGINSERVER; Server.serverMode = Server.MODE_LOGINSERVER;
// Local Constants
final String LOG_FOLDER = "log"; // Name of folder for log file
final String LOG_NAME = "./log.cfg"; // Name of log file
/*** Main ***/
// Create log folder // Create log folder
final File logFolder = new File(".", LOG_FOLDER); final File logFolder = new File(".", "log");
logFolder.mkdir(); logFolder.mkdir();
// Create input stream for log file -- or store file data into memory // Create input stream for log file -- or store file data into memory
try (InputStream is = new FileInputStream(new File(LOG_NAME))) try (InputStream is = new FileInputStream(new File("./log.cfg")))
{ {
LogManager.getLogManager().readConfiguration(is); LogManager.getLogManager().readConfiguration(is);
} }

View File

@@ -14,7 +14,7 @@ echo Possible reasons for this to happen:
echo. echo.
echo - Missing .jar files or ../libs directory. echo - Missing .jar files or ../libs directory.
echo - MySQL server not running or incorrect MySQL settings: echo - MySQL server not running or incorrect MySQL settings:
echo check ./config/loginserver.properties echo check ./config/loginserver.ini
echo - Wrong data types or values out of range were provided: echo - Wrong data types or values out of range were provided:
echo specify correct values for each required field echo specify correct values for each required field
echo. echo.

View File

@@ -151,10 +151,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName());
// Local Constants
private static final String LOG_FOLDER = "log"; // Name of folder for log file
private static final String LOG_NAME = "./log.cfg"; // Name of log file
private final DeadLockDetector _deadDetectThread; private final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
@@ -458,11 +454,11 @@ public class GameServer
/*** Main ***/ /*** Main ***/
// Create log folder // Create log folder
final File logFolder = new File(Config.DATAPACK_ROOT, LOG_FOLDER); final File logFolder = new File(Config.DATAPACK_ROOT, "log");
logFolder.mkdir(); logFolder.mkdir();
// Create input stream for log file -- or store file data into memory // Create input stream for log file -- or store file data into memory
try (InputStream is = new FileInputStream(new File(LOG_NAME))) try (InputStream is = new FileInputStream(new File("./log.cfg")))
{ {
LogManager.getLogManager().readConfiguration(is); LogManager.getLogManager().readConfiguration(is);
} }

View File

@@ -60,18 +60,13 @@ public final class LoginServer
_instance = this; _instance = this;
Server.serverMode = Server.MODE_LOGINSERVER; Server.serverMode = Server.MODE_LOGINSERVER;
// Local Constants
final String LOG_FOLDER = "log"; // Name of folder for log file
final String LOG_NAME = "./log.cfg"; // Name of log file
/*** Main ***/
// Create log folder // Create log folder
final File logFolder = new File(".", LOG_FOLDER); final File logFolder = new File(".", "log");
logFolder.mkdir(); logFolder.mkdir();
// Create input stream for log file -- or store file data into memory // Create input stream for log file -- or store file data into memory
try (InputStream is = new FileInputStream(new File(LOG_NAME))) try (InputStream is = new FileInputStream(new File("./log.cfg")))
{ {
LogManager.getLogManager().readConfiguration(is); LogManager.getLogManager().readConfiguration(is);
} }