From f699e2653ce7335e2c698aa51fff841e362b6233 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 30 Apr 2018 21:42:33 +0000 Subject: [PATCH] Updated startup files. --- .../dist/game/GameServer_loop.sh | 20 +-- .../dist/game/config/others/log.cfg | 104 ----------- L2J_Mobius_C6_Interlude/dist/game/console.cfg | 7 + L2J_Mobius_C6_Interlude/dist/game/log.cfg | 162 ++++++++++++++++++ .../dist/game/startGameServer.bat | 51 ++---- .../dist/game/startGameServer.sh | 3 + .../dist/login/LoginServer_loop.sh | 5 +- .../dist/login/RegisterGameServer.bat | 7 +- .../dist/login/RegisterGameServer.sh | 2 +- .../dist/login/config/others/log.cfg | 104 ----------- .../dist/login/console.cfg | 7 + L2J_Mobius_C6_Interlude/dist/login/log.cfg | 162 ++++++++++++++++++ .../dist/login/startLoginServer.bat | 22 +-- .../dist/login/startLoginServer.sh | 3 + .../dist/login/startSQLAccountManager.bat | 2 +- .../dist/login/startSQLAccountManager.sh | 2 +- .../com/l2jmobius/gameserver/GameServer.java | 2 +- .../java/com/l2jmobius/log/L2LogManager.java | 41 +++++ .../log/{ => filter}/AuditFilter.java | 2 +- .../log/{ => filter}/ChatFilter.java | 2 +- .../log/{ => filter}/ErrorFilter.java | 2 +- .../log/{ => filter}/ItemFilter.java | 2 +- .../{ => formatter}/AbstractFormatter.java | 2 +- .../log/{ => formatter}/AuditFormatter.java | 2 +- .../log/{ => formatter}/ChatLogFormatter.java | 2 +- .../{ => formatter}/ConsoleLogFormatter.java | 2 +- .../log/{ => formatter}/FileLogFormatter.java | 2 +- .../log/{ => formatter}/ItemLogFormatter.java | 2 +- .../log/{ => handler}/AuditLogHandler.java | 2 +- .../log/{ => handler}/ChatLogHandler.java | 2 +- .../log/{ => handler}/ErrorLogHandler.java | 2 +- .../log/{ => handler}/ItemLogHandler.java | 2 +- .../l2jmobius/loginserver/LoginServer.java | 2 +- 33 files changed, 446 insertions(+), 290 deletions(-) delete mode 100644 L2J_Mobius_C6_Interlude/dist/game/config/others/log.cfg create mode 100644 L2J_Mobius_C6_Interlude/dist/game/console.cfg create mode 100644 L2J_Mobius_C6_Interlude/dist/game/log.cfg create mode 100644 L2J_Mobius_C6_Interlude/dist/game/startGameServer.sh delete mode 100644 L2J_Mobius_C6_Interlude/dist/login/config/others/log.cfg create mode 100644 L2J_Mobius_C6_Interlude/dist/login/console.cfg create mode 100644 L2J_Mobius_C6_Interlude/dist/login/log.cfg create mode 100644 L2J_Mobius_C6_Interlude/dist/login/startLoginServer.sh create mode 100644 L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/L2LogManager.java rename L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/{ => filter}/AuditFilter.java (96%) rename L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/{ => filter}/ChatFilter.java (96%) rename L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/{ => filter}/ErrorFilter.java (96%) rename L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/{ => filter}/ItemFilter.java (98%) rename L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/{ => formatter}/AbstractFormatter.java (97%) rename L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/{ => formatter}/AuditFormatter.java (97%) rename L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/{ => formatter}/ChatLogFormatter.java (97%) rename L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/{ => formatter}/ConsoleLogFormatter.java (97%) rename L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/{ => formatter}/FileLogFormatter.java (97%) rename L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/{ => formatter}/ItemLogFormatter.java (98%) rename L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/{ => handler}/AuditLogHandler.java (96%) rename L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/{ => handler}/ChatLogHandler.java (96%) rename L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/{ => handler}/ErrorLogHandler.java (96%) rename L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/{ => handler}/ItemLogHandler.java (96%) diff --git a/L2J_Mobius_C6_Interlude/dist/game/GameServer_loop.sh b/L2J_Mobius_C6_Interlude/dist/game/GameServer_loop.sh index 8d63540173..65ff2c74f2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/GameServer_loop.sh +++ b/L2J_Mobius_C6_Interlude/dist/game/GameServer_loop.sh @@ -1,14 +1,14 @@ #!/bin/bash -DBHOST=localhost -USER=root -PASS= -DBNAME=l2jmobiusc6 +# exit codes of GameServer: +# 0 normal shutdown +# 2 reboot attempt -err=1 -until [ $err == 0 ]; -do - java -Dfile.encoding=UTF-8 -Djava.util.logging.config.file=config/others/log.cfg -Xms2048m -Xmx4096m -cp ./libs/*:GameServer.jar com.l2jmobius.gameserver.GameServer > log/stdout.log 2>&1 - err=$? - sleep 10 +while :; do + [ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log" + [ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log" + java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar GameServer.jar > log/stdout.log 2>&1 + [ $? -ne 2 ] && break +# /etc/init.d/mysql restart + sleep 10 done diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/others/log.cfg b/L2J_Mobius_C6_Interlude/dist/game/config/others/log.cfg deleted file mode 100644 index 96be5276e0..0000000000 --- a/L2J_Mobius_C6_Interlude/dist/game/config/others/log.cfg +++ /dev/null @@ -1,104 +0,0 @@ -############################################################ -# Global properties -############################################################ - -# "handlers" specifies a comma separated list of log Handler -# classes. These handlers will be installed during VM startup. -# Note that these classes must be on the system classpath. -# By default we only configure a ConsoleHandler, which will only -# show messages at the INFO and above levels. -#handlers = java.util.logging.ConsoleHandler - -# To also add the FileHandler, use the following line instead. -handlers = java.util.logging.FileHandler,java.util.logging.ConsoleHandler,\ - com.l2jmobius.log.ErrorLogHandler -chat.handlers = com.l2jmobius.log.ChatLogHandler -chat.useParentHandlers = false -gmaudit.handlers = com.l2jmobius.log.GMAuditLogHandler -gmaudit.useParentHandlers = false -item.handlers = com.l2jmobius.log.ItemLogHandler -item.useParentHandlers = false -audit.handlers = com.l2jmobius.log.AuditLogHandler -audit.useParentHandlers = false - - -# Default global logging level. -# This specifies which kinds of events are logged across -# all loggers. For any given facility this global level -# can be overriden by a facility specific level -# Note that the ConsoleHandler also has a separate level -# setting to limit messages printed to the console. -.level = CONFIG - -############################################################ -# Handler specific properties. -# Describes specific configuration info for Handlers. -############################################################ - -# default file output is in user's home directory. -java.util.logging.FileHandler.pattern = log/java%u.log -java.util.logging.FileHandler.limit = 500000 -java.util.logging.FileHandler.count = 5 -java.util.logging.FileHandler.formatter = com.l2jmobius.log.FileLogFormatter -java.util.logging.FileHandler.level = CONFIG - -# Limit the message that are printed on the console to INFO and above. -java.util.logging.ConsoleHandler.level = FINER -java.util.logging.ConsoleHandler.formatter = com.l2jmobius.log.ConsoleLogFormatter - -# log errors (exceptions) -com.l2jmobius.log.ErrorLogHandler.pattern = log/error%u.log -com.l2jmobius.log.ErrorLogHandler.count = 5 -com.l2jmobius.log.ErrorLogHandler.formatter = java.util.logging.SimpleFormatter -com.l2jmobius.log.ErrorLogHandler.filter = com.l2jmobius.log.ErrorFilter -com.l2jmobius.log.ErrorLogHandler.level = CONFIG - -# log chats -com.l2jmobius.log.ChatLogHandler.pattern = log/chat.log -com.l2jmobius.log.ChatLogHandler.formatter = com.l2jmobius.log.ChatLogFormatter -com.l2jmobius.log.ChatLogHandler.filter = com.l2jmobius.log.ChatFilter -com.l2jmobius.log.ChatLogHandler.append = true -com.l2jmobius.log.ChatLogHandler.level = INFO - -# log GM Audit -com.l2jmobius.log.GMAuditLogHandler.pattern = log/gmaudit.log -com.l2jmobius.log.GMAuditLogHandler.formatter = com.l2jmobius.log.GMAuditFormatter -com.l2jmobius.log.GMAuditLogHandler.filter = com.l2jmobius.log.GMAuditFilter -com.l2jmobius.log.GMAuditLogHandler.append = true -com.l2jmobius.log.GMAuditLogHandler.level = INFO - -# log items -com.l2jmobius.log.ItemLogHandler.pattern = log/item.log -com.l2jmobius.log.ItemLogHandler.formatter = com.l2jmobius.log.ItemLogFormatter -com.l2jmobius.log.ItemLogHandler.filter = com.l2jmobius.log.ItemFilter -com.l2jmobius.log.ItemLogHandler.append = true -com.l2jmobius.log.ItemLogHandler.level = INFO - -# audit -com.l2jmobius.log.AuditLogHandler.pattern = log/audit.log -com.l2jmobius.log.AuditLogHandler.formatter = com.l2jmobius.log.AuditFormatter -com.l2jmobius.log.AuditLogHandler.filter = com.l2jmobius.log.AuditFilter -com.l2jmobius.log.AuditLogHandler.append = true -com.l2jmobius.log.AuditLogHandler.level = INFO - - -############################################################ -# Facility specific properties. -# Provides extra control for each logger. -############################################################ - -# For example, set the com.xyz.foo logger to only log SEVERE -# messages: -com.l2jmobius.gameserver.level = CONFIG -com.l2jmobius.loginserver.level = CONFIG -com.l2jmobius.gameserver.Connection.level = CONFIG -com.l2jmobius.gameserver.serverpackets.level = FINER -com.l2jmobius.gameserver.clientpackets.level = FINER -com.l2jmobius.gameserver.model.L2Character.level = FINER -com.l2jmobius.gameserver.skills.SkillsEngine.level = WARNING - -# Alt Privileges Administration -AltPrivilegesAdmin.pattern = log/admin-commands.log -AltPrivilegesAdmin.formatter = com.l2jmobius.log.FileLogFormatter -AltPrivilegesAdmin.append = true -AltPrivilegesAdmin.level = CONFIG \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/console.cfg b/L2J_Mobius_C6_Interlude/dist/game/console.cfg new file mode 100644 index 0000000000..bfea9358b3 --- /dev/null +++ b/L2J_Mobius_C6_Interlude/dist/game/console.cfg @@ -0,0 +1,7 @@ +# Default global logging level. +# This specifies which kinds of events are logged across +# all loggers. For any given facility this global level +# can be overriden by a facility specific level +# Note that the ConsoleHandler also has a separate level +# setting to limit messages printed to the console. +.level=OFF diff --git a/L2J_Mobius_C6_Interlude/dist/game/log.cfg b/L2J_Mobius_C6_Interlude/dist/game/log.cfg new file mode 100644 index 0000000000..00cea0c278 --- /dev/null +++ b/L2J_Mobius_C6_Interlude/dist/game/log.cfg @@ -0,0 +1,162 @@ +############################################################ +# Global properties +############################################################ + +# "handlers" specifies a comma separated list of log Handler +# classes. These handlers will be installed during VM startup. +# Note that these classes must be on the system classpath. +# By default we only configure a ConsoleHandler, which will only +# show messages at the INFO and above levels. +#handlers= java.util.logging.ConsoleHandler + +# To also add the FileHandler, use the following line instead. +handlers = java.util.logging.FileHandler,\ + java.util.logging.ConsoleHandler,\ + com.l2jmobius.log.handler.ErrorLogHandler +chat.handlers = com.l2jmobius.log.handler.ChatLogHandler +chat.useParentHandlers = false +gmaudit.handlers = com.l2jmobius.log.handler.GMAuditLogHandler +gmaudit.useParentHandlers = false +item.handlers = com.l2jmobius.log.handler.ItemLogHandler +item.useParentHandlers = false +audit.handlers = com.l2jmobius.log.handler.AuditLogHandler +audit.useParentHandlers = false +enchant.handlers = com.l2jmobius.log.handler.EnchantItemLogHandler,\ + com.l2jmobius.log.handler.EnchantSkillLogHandler +enchant.useParentHandlers = false +olympiad.handlers = com.l2jmobius.log.handler.OlympiadLogHandler +olympiad.useParentHandlers = false +damage.handlers = com.l2jmobius.log.handler.AllDamageLogHandler,\ + com.l2jmobius.log.handler.PDamageLogHandler,\ + com.l2jmobius.log.handler.MDamageLogHandler +damage.useParentHandlers = false +accounting.handlers = com.l2jmobius.log.handler.AccountingLogHandler +accounting.useParentHandlers = false + +# Default global logging level. +# This specifies which kinds of events are logged across +# all loggers. For any given facility this global level +# can be overriden by a facility specific level +# Note that the ConsoleHandler also has a separate level +# setting to limit messages printed to the console. +.level= CONFIG + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +# default file output is in user's home directory. +java.util.logging.FileHandler.pattern = log/java%g.log +java.util.logging.FileHandler.count = 20 +java.util.logging.FileHandler.limit = 0 +java.util.logging.FileHandler.formatter = com.l2jmobius.log.formatter.FileLogFormatter +java.util.logging.FileHandler.level = CONFIG + +# Limit the message that are printed on the console to INFO and above. +java.util.logging.ConsoleHandler.level = FINER +java.util.logging.ConsoleHandler.formatter = com.l2jmobius.log.formatter.ConsoleLogFormatter + +# log errors (exceptions) +com.l2jmobius.log.handler.ErrorLogHandler.pattern = log/error%g.log +com.l2jmobius.log.handler.ErrorLogHandler.count = 20 +com.l2jmobius.log.handler.ErrorLogHandler.limit = 0 +com.l2jmobius.log.handler.ErrorLogHandler.formatter = java.util.logging.SimpleFormatter +com.l2jmobius.log.handler.ErrorLogHandler.filter = com.l2jmobius.log.filter.ErrorFilter +com.l2jmobius.log.handler.ErrorLogHandler.level = CONFIG + +# log chats +com.l2jmobius.log.handler.ChatLogHandler.pattern = log/chat.log +com.l2jmobius.log.handler.ChatLogHandler.formatter = com.l2jmobius.log.formatter.ChatLogFormatter +com.l2jmobius.log.handler.ChatLogHandler.filter = com.l2jmobius.log.filter.ChatFilter +com.l2jmobius.log.handler.ChatLogHandler.append = true +com.l2jmobius.log.handler.ChatLogHandler.level = INFO + +# log GM Audit +com.l2jmobius.log.handler.GMAuditLogHandler.pattern = log/gmaudit.log +com.l2jmobius.log.handler.GMAuditLogHandler.formatter = com.l2jmobius.log.formatter.GMAuditFormatter +com.l2jmobius.log.handler.GMAuditLogHandler.filter = com.l2jmobius.log.filter.GMAuditFilter +com.l2jmobius.log.handler.GMAuditLogHandler.append = true +com.l2jmobius.log.handler.GMAuditLogHandler.level = INFO + +# log items +com.l2jmobius.log.handler.ItemLogHandler.pattern = log/item.log +com.l2jmobius.log.handler.ItemLogHandler.formatter = com.l2jmobius.log.formatter.ItemLogFormatter +com.l2jmobius.log.handler.ItemLogHandler.filter = com.l2jmobius.log.filter.ItemFilter +com.l2jmobius.log.handler.ItemLogHandler.append = true +com.l2jmobius.log.handler.ItemLogHandler.level = INFO + +# audit +com.l2jmobius.log.handler.AuditLogHandler.pattern = log/audit.log +com.l2jmobius.log.handler.AuditLogHandler.formatter = com.l2jmobius.log.formatter.AuditFormatter +com.l2jmobius.log.handler.AuditLogHandler.filter = com.l2jmobius.log.filter.AuditFilter +com.l2jmobius.log.handler.AuditLogHandler.append = true +com.l2jmobius.log.handler.AuditLogHandler.level = INFO + +# enchant item log +com.l2jmobius.log.handler.EnchantItemLogHandler.pattern = log/enchantitem.log +com.l2jmobius.log.handler.EnchantItemLogHandler.formatter = com.l2jmobius.log.formatter.EnchantFormatter +com.l2jmobius.log.handler.EnchantItemLogHandler.filter = com.l2jmobius.log.filter.EnchantItemFilter +com.l2jmobius.log.handler.EnchantItemLogHandler.append = true +com.l2jmobius.log.handler.EnchantItemLogHandler.level = INFO + +# enchant skill log +com.l2jmobius.log.handler.EnchantSkillLogHandler.pattern = log/enchantskill.log +com.l2jmobius.log.handler.EnchantSkillLogHandler.formatter = com.l2jmobius.log.formatter.EnchantFormatter +com.l2jmobius.log.handler.EnchantSkillLogHandler.filter = com.l2jmobius.log.filter.EnchantSkillFilter +com.l2jmobius.log.handler.EnchantSkillLogHandler.append = true +com.l2jmobius.log.handler.EnchantSkillLogHandler.level = INFO + +# olympiad log +com.l2jmobius.log.handler.OlympiadLogHandler.pattern = log/olympiad.csv +com.l2jmobius.log.handler.OlympiadLogHandler.formatter = com.l2jmobius.log.formatter.OlympiadFormatter +com.l2jmobius.log.handler.OlympiadLogHandler.append = true +com.l2jmobius.log.handler.OlympiadLogHandler.level = INFO + +# damage logs +com.l2jmobius.log.handler.AllDamageLogHandler.pattern = log/game/_all.txt +com.l2jmobius.log.handler.AllDamageLogHandler.formatter = com.l2jmobius.log.formatter.DamageFormatter +com.l2jmobius.log.handler.AllDamageLogHandler.append = true +com.l2jmobius.log.handler.AllDamageLogHandler.level = INFO + +com.l2jmobius.log.handler.PDamageLogHandler.pattern = log/game/damage_pdam.txt +com.l2jmobius.log.handler.PDamageLogHandler.formatter = com.l2jmobius.log.formatter.DamageFormatter +com.l2jmobius.log.handler.PDamageLogHandler.filter = com.l2jmobius.log.filter.PDamageFilter +com.l2jmobius.log.handler.PDamageLogHandler.append = true +com.l2jmobius.log.handler.PDamageLogHandler.level = INFO + +com.l2jmobius.log.handler.MDamageLogHandler.pattern = log/game/damage_mdam.txt +com.l2jmobius.log.handler.MDamageLogHandler.formatter = com.l2jmobius.log.formatter.DamageFormatter +com.l2jmobius.log.handler.MDamageLogHandler.filter = com.l2jmobius.log.filter.MDamageFilter +com.l2jmobius.log.handler.MDamageLogHandler.append = true +com.l2jmobius.log.handler.MDamageLogHandler.level = INFO + +# accounting +com.l2jmobius.log.handler.AccountingLogHandler.pattern = log/accounting.log +com.l2jmobius.log.handler.AccountingLogHandler.formatter = com.l2jmobius.log.formatter.AccountingFormatter +com.l2jmobius.log.handler.AccountingLogHandler.append = true +com.l2jmobius.log.handler.AccountingLogHandler.level = CONFIG + +############################################################ +# Facility specific properties. +# Provides extra control for each logger. +############################################################ + +# For example, set the com.xyz.foo logger to only log SEVERE +# messages: +com.l2jmobius.gameserver.level = CONFIG +com.l2jmobius.loginserver.level = CONFIG +#com.l2jmobius.gameserver.Connection.level = CONFIG +com.l2jmobius.gameserver.network.serverpackets.level = FINER +com.l2jmobius.gameserver.network.clientpackets.level = FINER +com.l2jmobius.gameserver.model.actor.L2Character.level = FINER +com.l2jmobius.gameserver.engines.DocumentEngine.level = INFO + +# Alt Privileges Administration +AltPrivilegesAdmin.pattern = log/admin-commands.log +AltPrivilegesAdmin.formatter = com.l2jmobius.log.formatter.FileLogFormatter +AltPrivilegesAdmin.append = true +AltPrivilegesAdmin.level = CONFIG + +# c3p0 Logging +com.mchange.v2.level = WARNING \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/startGameServer.bat b/L2J_Mobius_C6_Interlude/dist/game/startGameServer.bat index b30a7936ab..5aabe300d0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/startGameServer.bat +++ b/L2J_Mobius_C6_Interlude/dist/game/startGameServer.bat @@ -5,52 +5,33 @@ title L2J Mobius - Game Server Console echo Starting Game Server. echo. -java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.config.file=config/others/log.cfg -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -cp ./libs/*;Gameserver.jar com.l2jmobius.gameserver.GameServer +REM java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Dpython.cachedir=../cachedir -Xms1024m -Xmx1536m -jar GameServer.jar +java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar GameServer.jar + +REM NOTE: If you have a powerful machine, you could modify/add some extra parameters for performance, like: +REM -Xms1536m +REM -Xmx3072m +REM -XX:+AggressiveOpts +REM Use this parameters carefully, some of them could cause abnormal behavior, deadlocks, etc. +REM More info here: http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html -if ERRORLEVEL 7 goto telldown -if ERRORLEVEL 6 goto tellrestart -if ERRORLEVEL 5 goto taskrestart -if ERRORLEVEL 4 goto taskdown -REM 3 - abort if ERRORLEVEL 2 goto restart if ERRORLEVEL 1 goto error goto end -:tellrestart -echo. -echo Telnet server Restart ... -echo. -goto start -:taskrestart -echo. -echo Auto Task Restart ... -echo. -goto start + :restart echo. -echo Admin Restart ... +echo Admin Restarted Game Server. echo. goto start -:taskdown -echo . -echo Server terminated (Auto task) -echo . -:telldown -echo . -echo Server terminated (Telnet) -echo . + :error echo. -echo Server terminated abnormally +echo Game Server Terminated Abnormally! echo. + :end echo. -echo server terminated +echo Game Server Terminated. echo. -:question -set choix=q -set /p choix=Restart(r) or Quit(q) -if /i %choix%==r goto start -if /i %choix%==q goto exit -:exit -exit -pause +pause \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/startGameServer.sh b/L2J_Mobius_C6_Interlude/dist/game/startGameServer.sh new file mode 100644 index 0000000000..3c6c1cb7de --- /dev/null +++ b/L2J_Mobius_C6_Interlude/dist/game/startGameServer.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +./GameServer_loop.sh & \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/login/LoginServer_loop.sh b/L2J_Mobius_C6_Interlude/dist/login/LoginServer_loop.sh index af55d4bdf9..794e01ab41 100644 --- a/L2J_Mobius_C6_Interlude/dist/login/LoginServer_loop.sh +++ b/L2J_Mobius_C6_Interlude/dist/login/LoginServer_loop.sh @@ -3,8 +3,9 @@ err=1 until [ $err == 0 ]; do - java -Dfile.encoding=UTF-8 -Djava.util.logging.config.file=config/others/log.cfg -Xms128m -Xmx128m -cp lib/*:LoginServer.jar com.l2jmobius.loginserver.LoginServer > log/stdout.log 2>&1 + [ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log" + [ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log" + java -Xms128m -Xmx256m -jar LoginServer.jar > log/stdout.log 2>&1 err=$? -# /etc/init.d/mysql restart sleep 10; done diff --git a/L2J_Mobius_C6_Interlude/dist/login/RegisterGameServer.bat b/L2J_Mobius_C6_Interlude/dist/login/RegisterGameServer.bat index ced04ba170..0601033c52 100644 --- a/L2J_Mobius_C6_Interlude/dist/login/RegisterGameServer.bat +++ b/L2J_Mobius_C6_Interlude/dist/login/RegisterGameServer.bat @@ -1,2 +1,5 @@ -@java -Dfile.encoding=UTF-8 -Djava.util.logging.config.file=config/others/log.cfg -cp lib/*;LoginServer.jar com.l2jmobius.tools.gsregistering.GameServerRegister -@pause +@echo off +title Register Game Server +color 17 +java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.gsregistering.BaseGameServerRegister -c +pause \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/login/RegisterGameServer.sh b/L2J_Mobius_C6_Interlude/dist/login/RegisterGameServer.sh index efec8408e3..03abd37b47 100644 --- a/L2J_Mobius_C6_Interlude/dist/login/RegisterGameServer.sh +++ b/L2J_Mobius_C6_Interlude/dist/login/RegisterGameServer.sh @@ -1,2 +1,2 @@ #!/bin/sh -java -Dfile.encoding=UTF-8 -Djava.util.logging.config.file=config/others/log.cfg -cp lib/*:lib/LoginServer.jar com.l2jmobius.tools.gsregistering.GameServerRegister +java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.gsregistering.GameServerRegister -c \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/login/config/others/log.cfg b/L2J_Mobius_C6_Interlude/dist/login/config/others/log.cfg deleted file mode 100644 index 96be5276e0..0000000000 --- a/L2J_Mobius_C6_Interlude/dist/login/config/others/log.cfg +++ /dev/null @@ -1,104 +0,0 @@ -############################################################ -# Global properties -############################################################ - -# "handlers" specifies a comma separated list of log Handler -# classes. These handlers will be installed during VM startup. -# Note that these classes must be on the system classpath. -# By default we only configure a ConsoleHandler, which will only -# show messages at the INFO and above levels. -#handlers = java.util.logging.ConsoleHandler - -# To also add the FileHandler, use the following line instead. -handlers = java.util.logging.FileHandler,java.util.logging.ConsoleHandler,\ - com.l2jmobius.log.ErrorLogHandler -chat.handlers = com.l2jmobius.log.ChatLogHandler -chat.useParentHandlers = false -gmaudit.handlers = com.l2jmobius.log.GMAuditLogHandler -gmaudit.useParentHandlers = false -item.handlers = com.l2jmobius.log.ItemLogHandler -item.useParentHandlers = false -audit.handlers = com.l2jmobius.log.AuditLogHandler -audit.useParentHandlers = false - - -# Default global logging level. -# This specifies which kinds of events are logged across -# all loggers. For any given facility this global level -# can be overriden by a facility specific level -# Note that the ConsoleHandler also has a separate level -# setting to limit messages printed to the console. -.level = CONFIG - -############################################################ -# Handler specific properties. -# Describes specific configuration info for Handlers. -############################################################ - -# default file output is in user's home directory. -java.util.logging.FileHandler.pattern = log/java%u.log -java.util.logging.FileHandler.limit = 500000 -java.util.logging.FileHandler.count = 5 -java.util.logging.FileHandler.formatter = com.l2jmobius.log.FileLogFormatter -java.util.logging.FileHandler.level = CONFIG - -# Limit the message that are printed on the console to INFO and above. -java.util.logging.ConsoleHandler.level = FINER -java.util.logging.ConsoleHandler.formatter = com.l2jmobius.log.ConsoleLogFormatter - -# log errors (exceptions) -com.l2jmobius.log.ErrorLogHandler.pattern = log/error%u.log -com.l2jmobius.log.ErrorLogHandler.count = 5 -com.l2jmobius.log.ErrorLogHandler.formatter = java.util.logging.SimpleFormatter -com.l2jmobius.log.ErrorLogHandler.filter = com.l2jmobius.log.ErrorFilter -com.l2jmobius.log.ErrorLogHandler.level = CONFIG - -# log chats -com.l2jmobius.log.ChatLogHandler.pattern = log/chat.log -com.l2jmobius.log.ChatLogHandler.formatter = com.l2jmobius.log.ChatLogFormatter -com.l2jmobius.log.ChatLogHandler.filter = com.l2jmobius.log.ChatFilter -com.l2jmobius.log.ChatLogHandler.append = true -com.l2jmobius.log.ChatLogHandler.level = INFO - -# log GM Audit -com.l2jmobius.log.GMAuditLogHandler.pattern = log/gmaudit.log -com.l2jmobius.log.GMAuditLogHandler.formatter = com.l2jmobius.log.GMAuditFormatter -com.l2jmobius.log.GMAuditLogHandler.filter = com.l2jmobius.log.GMAuditFilter -com.l2jmobius.log.GMAuditLogHandler.append = true -com.l2jmobius.log.GMAuditLogHandler.level = INFO - -# log items -com.l2jmobius.log.ItemLogHandler.pattern = log/item.log -com.l2jmobius.log.ItemLogHandler.formatter = com.l2jmobius.log.ItemLogFormatter -com.l2jmobius.log.ItemLogHandler.filter = com.l2jmobius.log.ItemFilter -com.l2jmobius.log.ItemLogHandler.append = true -com.l2jmobius.log.ItemLogHandler.level = INFO - -# audit -com.l2jmobius.log.AuditLogHandler.pattern = log/audit.log -com.l2jmobius.log.AuditLogHandler.formatter = com.l2jmobius.log.AuditFormatter -com.l2jmobius.log.AuditLogHandler.filter = com.l2jmobius.log.AuditFilter -com.l2jmobius.log.AuditLogHandler.append = true -com.l2jmobius.log.AuditLogHandler.level = INFO - - -############################################################ -# Facility specific properties. -# Provides extra control for each logger. -############################################################ - -# For example, set the com.xyz.foo logger to only log SEVERE -# messages: -com.l2jmobius.gameserver.level = CONFIG -com.l2jmobius.loginserver.level = CONFIG -com.l2jmobius.gameserver.Connection.level = CONFIG -com.l2jmobius.gameserver.serverpackets.level = FINER -com.l2jmobius.gameserver.clientpackets.level = FINER -com.l2jmobius.gameserver.model.L2Character.level = FINER -com.l2jmobius.gameserver.skills.SkillsEngine.level = WARNING - -# Alt Privileges Administration -AltPrivilegesAdmin.pattern = log/admin-commands.log -AltPrivilegesAdmin.formatter = com.l2jmobius.log.FileLogFormatter -AltPrivilegesAdmin.append = true -AltPrivilegesAdmin.level = CONFIG \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/login/console.cfg b/L2J_Mobius_C6_Interlude/dist/login/console.cfg new file mode 100644 index 0000000000..bfea9358b3 --- /dev/null +++ b/L2J_Mobius_C6_Interlude/dist/login/console.cfg @@ -0,0 +1,7 @@ +# Default global logging level. +# This specifies which kinds of events are logged across +# all loggers. For any given facility this global level +# can be overriden by a facility specific level +# Note that the ConsoleHandler also has a separate level +# setting to limit messages printed to the console. +.level=OFF diff --git a/L2J_Mobius_C6_Interlude/dist/login/log.cfg b/L2J_Mobius_C6_Interlude/dist/login/log.cfg new file mode 100644 index 0000000000..00cea0c278 --- /dev/null +++ b/L2J_Mobius_C6_Interlude/dist/login/log.cfg @@ -0,0 +1,162 @@ +############################################################ +# Global properties +############################################################ + +# "handlers" specifies a comma separated list of log Handler +# classes. These handlers will be installed during VM startup. +# Note that these classes must be on the system classpath. +# By default we only configure a ConsoleHandler, which will only +# show messages at the INFO and above levels. +#handlers= java.util.logging.ConsoleHandler + +# To also add the FileHandler, use the following line instead. +handlers = java.util.logging.FileHandler,\ + java.util.logging.ConsoleHandler,\ + com.l2jmobius.log.handler.ErrorLogHandler +chat.handlers = com.l2jmobius.log.handler.ChatLogHandler +chat.useParentHandlers = false +gmaudit.handlers = com.l2jmobius.log.handler.GMAuditLogHandler +gmaudit.useParentHandlers = false +item.handlers = com.l2jmobius.log.handler.ItemLogHandler +item.useParentHandlers = false +audit.handlers = com.l2jmobius.log.handler.AuditLogHandler +audit.useParentHandlers = false +enchant.handlers = com.l2jmobius.log.handler.EnchantItemLogHandler,\ + com.l2jmobius.log.handler.EnchantSkillLogHandler +enchant.useParentHandlers = false +olympiad.handlers = com.l2jmobius.log.handler.OlympiadLogHandler +olympiad.useParentHandlers = false +damage.handlers = com.l2jmobius.log.handler.AllDamageLogHandler,\ + com.l2jmobius.log.handler.PDamageLogHandler,\ + com.l2jmobius.log.handler.MDamageLogHandler +damage.useParentHandlers = false +accounting.handlers = com.l2jmobius.log.handler.AccountingLogHandler +accounting.useParentHandlers = false + +# Default global logging level. +# This specifies which kinds of events are logged across +# all loggers. For any given facility this global level +# can be overriden by a facility specific level +# Note that the ConsoleHandler also has a separate level +# setting to limit messages printed to the console. +.level= CONFIG + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +# default file output is in user's home directory. +java.util.logging.FileHandler.pattern = log/java%g.log +java.util.logging.FileHandler.count = 20 +java.util.logging.FileHandler.limit = 0 +java.util.logging.FileHandler.formatter = com.l2jmobius.log.formatter.FileLogFormatter +java.util.logging.FileHandler.level = CONFIG + +# Limit the message that are printed on the console to INFO and above. +java.util.logging.ConsoleHandler.level = FINER +java.util.logging.ConsoleHandler.formatter = com.l2jmobius.log.formatter.ConsoleLogFormatter + +# log errors (exceptions) +com.l2jmobius.log.handler.ErrorLogHandler.pattern = log/error%g.log +com.l2jmobius.log.handler.ErrorLogHandler.count = 20 +com.l2jmobius.log.handler.ErrorLogHandler.limit = 0 +com.l2jmobius.log.handler.ErrorLogHandler.formatter = java.util.logging.SimpleFormatter +com.l2jmobius.log.handler.ErrorLogHandler.filter = com.l2jmobius.log.filter.ErrorFilter +com.l2jmobius.log.handler.ErrorLogHandler.level = CONFIG + +# log chats +com.l2jmobius.log.handler.ChatLogHandler.pattern = log/chat.log +com.l2jmobius.log.handler.ChatLogHandler.formatter = com.l2jmobius.log.formatter.ChatLogFormatter +com.l2jmobius.log.handler.ChatLogHandler.filter = com.l2jmobius.log.filter.ChatFilter +com.l2jmobius.log.handler.ChatLogHandler.append = true +com.l2jmobius.log.handler.ChatLogHandler.level = INFO + +# log GM Audit +com.l2jmobius.log.handler.GMAuditLogHandler.pattern = log/gmaudit.log +com.l2jmobius.log.handler.GMAuditLogHandler.formatter = com.l2jmobius.log.formatter.GMAuditFormatter +com.l2jmobius.log.handler.GMAuditLogHandler.filter = com.l2jmobius.log.filter.GMAuditFilter +com.l2jmobius.log.handler.GMAuditLogHandler.append = true +com.l2jmobius.log.handler.GMAuditLogHandler.level = INFO + +# log items +com.l2jmobius.log.handler.ItemLogHandler.pattern = log/item.log +com.l2jmobius.log.handler.ItemLogHandler.formatter = com.l2jmobius.log.formatter.ItemLogFormatter +com.l2jmobius.log.handler.ItemLogHandler.filter = com.l2jmobius.log.filter.ItemFilter +com.l2jmobius.log.handler.ItemLogHandler.append = true +com.l2jmobius.log.handler.ItemLogHandler.level = INFO + +# audit +com.l2jmobius.log.handler.AuditLogHandler.pattern = log/audit.log +com.l2jmobius.log.handler.AuditLogHandler.formatter = com.l2jmobius.log.formatter.AuditFormatter +com.l2jmobius.log.handler.AuditLogHandler.filter = com.l2jmobius.log.filter.AuditFilter +com.l2jmobius.log.handler.AuditLogHandler.append = true +com.l2jmobius.log.handler.AuditLogHandler.level = INFO + +# enchant item log +com.l2jmobius.log.handler.EnchantItemLogHandler.pattern = log/enchantitem.log +com.l2jmobius.log.handler.EnchantItemLogHandler.formatter = com.l2jmobius.log.formatter.EnchantFormatter +com.l2jmobius.log.handler.EnchantItemLogHandler.filter = com.l2jmobius.log.filter.EnchantItemFilter +com.l2jmobius.log.handler.EnchantItemLogHandler.append = true +com.l2jmobius.log.handler.EnchantItemLogHandler.level = INFO + +# enchant skill log +com.l2jmobius.log.handler.EnchantSkillLogHandler.pattern = log/enchantskill.log +com.l2jmobius.log.handler.EnchantSkillLogHandler.formatter = com.l2jmobius.log.formatter.EnchantFormatter +com.l2jmobius.log.handler.EnchantSkillLogHandler.filter = com.l2jmobius.log.filter.EnchantSkillFilter +com.l2jmobius.log.handler.EnchantSkillLogHandler.append = true +com.l2jmobius.log.handler.EnchantSkillLogHandler.level = INFO + +# olympiad log +com.l2jmobius.log.handler.OlympiadLogHandler.pattern = log/olympiad.csv +com.l2jmobius.log.handler.OlympiadLogHandler.formatter = com.l2jmobius.log.formatter.OlympiadFormatter +com.l2jmobius.log.handler.OlympiadLogHandler.append = true +com.l2jmobius.log.handler.OlympiadLogHandler.level = INFO + +# damage logs +com.l2jmobius.log.handler.AllDamageLogHandler.pattern = log/game/_all.txt +com.l2jmobius.log.handler.AllDamageLogHandler.formatter = com.l2jmobius.log.formatter.DamageFormatter +com.l2jmobius.log.handler.AllDamageLogHandler.append = true +com.l2jmobius.log.handler.AllDamageLogHandler.level = INFO + +com.l2jmobius.log.handler.PDamageLogHandler.pattern = log/game/damage_pdam.txt +com.l2jmobius.log.handler.PDamageLogHandler.formatter = com.l2jmobius.log.formatter.DamageFormatter +com.l2jmobius.log.handler.PDamageLogHandler.filter = com.l2jmobius.log.filter.PDamageFilter +com.l2jmobius.log.handler.PDamageLogHandler.append = true +com.l2jmobius.log.handler.PDamageLogHandler.level = INFO + +com.l2jmobius.log.handler.MDamageLogHandler.pattern = log/game/damage_mdam.txt +com.l2jmobius.log.handler.MDamageLogHandler.formatter = com.l2jmobius.log.formatter.DamageFormatter +com.l2jmobius.log.handler.MDamageLogHandler.filter = com.l2jmobius.log.filter.MDamageFilter +com.l2jmobius.log.handler.MDamageLogHandler.append = true +com.l2jmobius.log.handler.MDamageLogHandler.level = INFO + +# accounting +com.l2jmobius.log.handler.AccountingLogHandler.pattern = log/accounting.log +com.l2jmobius.log.handler.AccountingLogHandler.formatter = com.l2jmobius.log.formatter.AccountingFormatter +com.l2jmobius.log.handler.AccountingLogHandler.append = true +com.l2jmobius.log.handler.AccountingLogHandler.level = CONFIG + +############################################################ +# Facility specific properties. +# Provides extra control for each logger. +############################################################ + +# For example, set the com.xyz.foo logger to only log SEVERE +# messages: +com.l2jmobius.gameserver.level = CONFIG +com.l2jmobius.loginserver.level = CONFIG +#com.l2jmobius.gameserver.Connection.level = CONFIG +com.l2jmobius.gameserver.network.serverpackets.level = FINER +com.l2jmobius.gameserver.network.clientpackets.level = FINER +com.l2jmobius.gameserver.model.actor.L2Character.level = FINER +com.l2jmobius.gameserver.engines.DocumentEngine.level = INFO + +# Alt Privileges Administration +AltPrivilegesAdmin.pattern = log/admin-commands.log +AltPrivilegesAdmin.formatter = com.l2jmobius.log.formatter.FileLogFormatter +AltPrivilegesAdmin.append = true +AltPrivilegesAdmin.level = CONFIG + +# c3p0 Logging +com.mchange.v2.level = WARNING \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/login/startLoginServer.bat b/L2J_Mobius_C6_Interlude/dist/login/startLoginServer.bat index 7b8453b3e7..1ed6b50463 100644 --- a/L2J_Mobius_C6_Interlude/dist/login/startLoginServer.bat +++ b/L2J_Mobius_C6_Interlude/dist/login/startLoginServer.bat @@ -5,32 +5,26 @@ title L2J Mobius - Login Server Console echo Starting Login Server. echo. -java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.config.file=config/others/log.cfg -Xms128m -Xmx256m -cp ./lib/*;LoginServer.jar com.l2jmobius.loginserver.LoginServer +REM java -Xms128m -Xmx256m -jar LoginServer.jar +java -version:1.8 -server -Xms128m -Xmx256m -jar LoginServer.jar if ERRORLEVEL 2 goto restart if ERRORLEVEL 1 goto error goto end + :restart echo. -echo Admin Restarted ... -ping -n 5 localhost > nul +echo Admin Restarted Login Server. echo. goto start + :error echo. -echo LoginServer terminated abnormaly -ping -n 5 localhost > nul +echo Login Server terminated abnormally! echo. -goto start + :end echo. -echo LoginServer terminated +echo Login Server Terminated. echo. -:question -set choix=q -set /p choix=Restart(r) or Quit(q) -if /i %choix%==r goto start -if /i %choix%==q goto exit -:exit -exit pause diff --git a/L2J_Mobius_C6_Interlude/dist/login/startLoginServer.sh b/L2J_Mobius_C6_Interlude/dist/login/startLoginServer.sh new file mode 100644 index 0000000000..84bfb3af2b --- /dev/null +++ b/L2J_Mobius_C6_Interlude/dist/login/startLoginServer.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +./LoginServer_loop.sh & diff --git a/L2J_Mobius_C6_Interlude/dist/login/startSQLAccountManager.bat b/L2J_Mobius_C6_Interlude/dist/login/startSQLAccountManager.bat index 16245045a1..6f6d9fb509 100644 --- a/L2J_Mobius_C6_Interlude/dist/login/startSQLAccountManager.bat +++ b/L2J_Mobius_C6_Interlude/dist/login/startSQLAccountManager.bat @@ -1,7 +1,7 @@ @echo off title SQL Account Manager color 17 -java -version:1.8 -Dfile.encoding=UTF-8 -Djava.util.logging.config.file=config/others/log.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager +java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager if %errorlevel% == 0 ( echo. echo Execution successful diff --git a/L2J_Mobius_C6_Interlude/dist/login/startSQLAccountManager.sh b/L2J_Mobius_C6_Interlude/dist/login/startSQLAccountManager.sh index d0f43d1d85..d090d4ff98 100644 --- a/L2J_Mobius_C6_Interlude/dist/login/startSQLAccountManager.sh +++ b/L2J_Mobius_C6_Interlude/dist/login/startSQLAccountManager.sh @@ -1,2 +1,2 @@ #!/bin/sh -java -Dfile.encoding=UTF-8 -Djava.util.logging.config.file=config/others/log.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager +java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/GameServer.java index a56d891d52..df1fedbf78 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/GameServer.java @@ -149,7 +149,7 @@ public class GameServer // Local Constants private static final String LOG_FOLDER = "log"; // Name of folder for log file - private static final String LOG_NAME = "./config/others/log.cfg"; // Name of log file + private static final String LOG_NAME = "./log.cfg"; // Name of log file private static SelectorThread _selectorThread; private static LoginServerThread _loginThread; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/L2LogManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/L2LogManager.java new file mode 100644 index 0000000000..ee7bfbd213 --- /dev/null +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/L2LogManager.java @@ -0,0 +1,41 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.l2jmobius.log; + +import java.util.logging.LogManager; + +/** + * Specialized {@link LogManager} class.
+ * Prevents log devices to close before shutdown sequence so the shutdown sequence can make logging. + */ +public class L2LogManager extends LogManager +{ + public L2LogManager() + { + } + + @Override + public void reset() + { + // do nothing + } + + public void doReset() + { + super.reset(); + } +} diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/AuditFilter.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/filter/AuditFilter.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/AuditFilter.java rename to L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/filter/AuditFilter.java index 78000f8eca..750ad81eaa 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/AuditFilter.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/filter/AuditFilter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.log; +package com.l2jmobius.log.filter; import java.util.logging.Filter; import java.util.logging.LogRecord; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ChatFilter.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/filter/ChatFilter.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ChatFilter.java rename to L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/filter/ChatFilter.java index 386150de2a..305cdf086a 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ChatFilter.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/filter/ChatFilter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.log; +package com.l2jmobius.log.filter; import java.util.logging.Filter; import java.util.logging.LogRecord; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ErrorFilter.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/filter/ErrorFilter.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ErrorFilter.java rename to L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/filter/ErrorFilter.java index 4453df99fa..7b837d47a7 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ErrorFilter.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/filter/ErrorFilter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.log; +package com.l2jmobius.log.filter; import java.util.logging.Filter; import java.util.logging.LogRecord; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ItemFilter.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/filter/ItemFilter.java similarity index 98% rename from L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ItemFilter.java rename to L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/filter/ItemFilter.java index 4e2831ee5a..17be491a11 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ItemFilter.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/filter/ItemFilter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.log; +package com.l2jmobius.log.filter; import java.util.logging.Filter; import java.util.logging.LogRecord; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/AbstractFormatter.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/AbstractFormatter.java similarity index 97% rename from L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/AbstractFormatter.java rename to L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/AbstractFormatter.java index 602528160d..4bbc276c13 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/AbstractFormatter.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/AbstractFormatter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.log; +package com.l2jmobius.log.formatter; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/AuditFormatter.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/AuditFormatter.java similarity index 97% rename from L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/AuditFormatter.java rename to L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/AuditFormatter.java index fb04b11e37..b241ef1ea2 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/AuditFormatter.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/AuditFormatter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.log; +package com.l2jmobius.log.formatter; import java.util.logging.LogRecord; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ChatLogFormatter.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/ChatLogFormatter.java similarity index 97% rename from L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ChatLogFormatter.java rename to L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/ChatLogFormatter.java index 467eda0db8..618be791a9 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ChatLogFormatter.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/ChatLogFormatter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.log; +package com.l2jmobius.log.formatter; import java.util.logging.LogRecord; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ConsoleLogFormatter.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/ConsoleLogFormatter.java similarity index 97% rename from L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ConsoleLogFormatter.java rename to L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/ConsoleLogFormatter.java index 471babb734..b2cd4f40da 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ConsoleLogFormatter.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/ConsoleLogFormatter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.log; +package com.l2jmobius.log.formatter; import java.util.logging.LogRecord; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/FileLogFormatter.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/FileLogFormatter.java similarity index 97% rename from L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/FileLogFormatter.java rename to L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/FileLogFormatter.java index 6ec74ec40a..a9c12d1d90 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/FileLogFormatter.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/FileLogFormatter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.log; +package com.l2jmobius.log.formatter; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ItemLogFormatter.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/ItemLogFormatter.java similarity index 98% rename from L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ItemLogFormatter.java rename to L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/ItemLogFormatter.java index 491a72a21f..b78db1736e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ItemLogFormatter.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/formatter/ItemLogFormatter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.log; +package com.l2jmobius.log.formatter; import java.util.logging.LogRecord; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/AuditLogHandler.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/handler/AuditLogHandler.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/AuditLogHandler.java rename to L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/handler/AuditLogHandler.java index 4af6f18898..7d4caa56d2 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/AuditLogHandler.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/handler/AuditLogHandler.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.log; +package com.l2jmobius.log.handler; import java.io.IOException; import java.util.logging.FileHandler; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ChatLogHandler.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/handler/ChatLogHandler.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ChatLogHandler.java rename to L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/handler/ChatLogHandler.java index c14b33dbd0..d4a2854c6e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ChatLogHandler.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/handler/ChatLogHandler.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.log; +package com.l2jmobius.log.handler; import java.io.IOException; import java.util.logging.FileHandler; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ErrorLogHandler.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/handler/ErrorLogHandler.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ErrorLogHandler.java rename to L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/handler/ErrorLogHandler.java index febf1a648c..3755610eb1 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ErrorLogHandler.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/handler/ErrorLogHandler.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.log; +package com.l2jmobius.log.handler; import java.io.IOException; import java.util.logging.FileHandler; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ItemLogHandler.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/handler/ItemLogHandler.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ItemLogHandler.java rename to L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/handler/ItemLogHandler.java index d929d877b5..d78d48258d 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/ItemLogHandler.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/log/handler/ItemLogHandler.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.log; +package com.l2jmobius.log.handler; import java.io.IOException; import java.util.logging.FileHandler; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginServer.java index 570a10c3aa..3f4146b882 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginServer.java @@ -63,7 +63,7 @@ public class LoginServer Server.serverMode = Server.MODE_LOGINSERVER; // Local Constants final String LOG_FOLDER = "log"; // Name of folder for log file - final String LOG_NAME = "./config/others/log.cfg"; // Name of log file + final String LOG_NAME = "./log.cfg"; // Name of log file /*** Main ***/ // Create log folder