diff options
| author | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-24 21:47:44 +0000 |
|---|---|---|
| committer | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-24 21:47:44 +0000 |
| commit | 2520c06f4984e7fd3d98bc5320328fb638dc7117 (patch) | |
| tree | 96cacd070ebf090ba2f79fc4bda9dfedb031de04 /conf | |
| parent | 3ba20d9e938ca6af6482160923c36030bb2fb894 (diff) | |
| download | hercules-2520c06f4984e7fd3d98bc5320328fb638dc7117.tar.gz hercules-2520c06f4984e7fd3d98bc5320328fb638dc7117.tar.bz2 hercules-2520c06f4984e7fd3d98bc5320328fb638dc7117.tar.xz hercules-2520c06f4984e7fd3d98bc5320328fb638dc7117.zip | |
* Merged changes up to eAthena 15042.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15253 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/Changelog.txt | 1 | ||||
| -rw-r--r-- | conf/log_athena.conf | 60 |
2 files changed, 25 insertions, 36 deletions
diff --git a/conf/Changelog.txt b/conf/Changelog.txt index 715133a6f..9e5bafd00 100644 --- a/conf/Changelog.txt +++ b/conf/Changelog.txt @@ -1,6 +1,7 @@ Date Added 2011/12/24 + * Rev. 15042 Merged log settings for SQL tables and TXT flat files (log_*_db, meaning depends on sql_logs setting). [Ai4rei] * Rev. 15040 Updates to log_athena.conf [Ai4rei] - Setting 'enable_logs' is now a pure bitmask and no longer affects misc-logs (branch, zeny etc). Meaning of most bits changed, revise your log configuration before starting the server. - Where applicable, settings support hexadecimal and boolean values instead of only integers. diff --git a/conf/log_athena.conf b/conf/log_athena.conf index 2578c67cf..9e4492ada 100644 --- a/conf/log_athena.conf +++ b/conf/log_athena.conf @@ -105,48 +105,36 @@ log_chat: 0 // Disable chat logging when WoE is running? (Note 1) log_chat_woe_disable: no -// Dead Branch Log Table -log_branch_db: branchlog +// Logging tables/files +// Following settings specify where to log to. If 'sql_logs' is +// enabled, SQL tables are assumed, otherwise flat files. -// Drops & Pickups Table -log_pick_db: picklog +// Dead Branch Log +log_branch_db: log/branchlog.log +//log_branch_db: branchlog -// Zeny Table -log_zeny_db: zenylog +// Drops & Pickups +log_pick_db: log/picklog.log +//log_pick_db: picklog -// MVP Drop Table -log_mvpdrop_db: mvplog +// Zeny +log_zeny_db: log/zenylog.log +//log_zeny_db: zenylog -// GM Log Table -log_gm_db: atcommandlog +// MVP Drops +log_mvpdrop_db: log/mvplog.log +//log_mvpdrop_db: mvplog -// NPC Log Table -log_npc_db: npclog +// GM Log +log_gm_db: log/atcommandlog.log +//log_gm_db: atcommandlog -// CHAT Log Table -log_chat_db: chatlog - - -// Dead Branch Log File -log_branch_file: log/branchlog.log - -// Drops & Pickups Log File -log_pick_file: log/picklog.log - -// Zeny Log File -log_zeny_file: log/zenylog.log - -// MVP Drop File -log_mvpdrop_file: log/mvplog.log - -// GM Log File -log_gm_file: log/atcommandlog.log - -// NPC Log File -log_npc_file: log/npclog.log - -// CHAT Log File -log_chat_file: log/chatlog.log +// NPC Log +log_npc_db: log/npclog.log +//log_npc_db: npclog +// CHAT Log +log_chat_db: log/chatlog.log +//log_chat_db: chatlog import: conf/import/log_conf.txt |