diff options
| -rwxr-xr-x | apps/ci/ci-error-check.sh | 19 | ||||
| -rw-r--r-- | src/server/apps/worldserver/worldserver.conf.dist | 7 |
2 files changed, 14 insertions, 12 deletions
diff --git a/apps/ci/ci-error-check.sh b/apps/ci/ci-error-check.sh index d446e904be..1862fa7122 100755 --- a/apps/ci/ci-error-check.sh +++ b/apps/ci/ci-error-check.sh @@ -1,17 +1,18 @@ #!/usr/bin/env bash -DB_ERRORS_FILE="./env/dist/bin/DBErrors.log"; +ERRORS_FILE="./env/dist/bin/Errors.log"; -if [[ ! -f ${DB_ERRORS_FILE} ]]; then - echo "File ${DB_ERRORS_FILE} not found!"; - exit 1 -fi +echo "Checking Startup Errors" +echo -if [[ -s ${DB_ERRORS_FILE} ]]; then - printf "The DBErrors.log file contains startup errors:\n\n"; - cat ${DB_ERRORS_FILE}; +if [[ -s ${ERRORS_FILE} ]]; then + printf "The Errors.log file contains startup errors:\n\n"; + cat ${ERRORS_FILE}; printf "\nPlease solve the startup errors listed above!\n"; exit 1; else - echo "No startup errors found in DBErrors.log, good job!"; + echo "> No startup errors found in Errors.log"; fi + +echo +echo "Done" diff --git a/src/server/apps/worldserver/worldserver.conf.dist b/src/server/apps/worldserver/worldserver.conf.dist index 4d200a78ee..0a5372c5c2 100644 --- a/src/server/apps/worldserver/worldserver.conf.dist +++ b/src/server/apps/worldserver/worldserver.conf.dist @@ -3949,8 +3949,8 @@ AuctionHouse.SearchTimeout = 1000 Appender.Console=1,4,0,"1 9 3 6 5 8" Appender.Server=2,5,0,Server.log,w -Appender.GM=2,5,15,gm_%s.log -Appender.DBErrors=2,5,0,DBErrors.log +# Appender.GM=2,5,15,gm_%s.log +Appender.Errors=2,5,0,Errors.log # Appender.DB=3,5,0 # Logger config values: Given a logger "name" @@ -3977,10 +3977,11 @@ Logger.diff=3,Console Server Logger.mmaps=4,Server Logger.scripts.hotswap=4,Console Server Logger.server=4,Console Server -Logger.sql.sql=2,Console DBErrors +Logger.sql.sql=2,Console Errors Logger.sql=4,Console Server Logger.time.update=4,Console Server Logger.module=4,Console Server +Logger.spells.scripts=2,Console Errors #Logger.achievement=4,Console Server #Logger.addon=4,Console Server |