Merge pull request #1 from Earisu/master

updating, with earisu's

1 files changed, 13 insertions, 5 deletions

diff --git a/conf/inter-server.conf b/conf/inter-server.conf
index b116a6a88..bf8d9e7a3 100644
--- a/conf/inter-server.conf
+++ b/conf/inter-server.conf
@@ -1,4 +1,4 @@
-// Athena InterServer configuration.
+// Hercules InterServer (settings shared/used by more than 1 server) configuration.
 
 // Options for both versions
 
@@ -56,6 +56,18 @@ log_db_db: ragnarok
 log_codepage:
 log_login_db: loginlog
 
+// == MySQL Reconnect Settings
+// ===========================
+// - mysql_reconnect_type
+// - 1: when mysql disconnects during runtime, the server tries to reconnect mysql_reconnect_count times and,
+// -- if unsuccessful, the server is shut down
+// - 2: when mysql disconnects during runtime it tries to reconnect indefinitely
+mysql_reconnect_type:2
+// - mysql_reconnect_count
+// - number of reconnect attempts the server should do when the database disconnects during runtime
+// - only used when mysql_reconnect_type is 1
+mysql_reconnect_count:1
+
 // DO NOT CHANGE ANYTHING BEYOND THIS LINE UNLESS YOU KNOW YOUR DATABASE DAMN WELL
 // this is meant for people who KNOW their stuff, and for some reason want to change their
 // database layout. [CLOWNISIUS]
@@ -107,8 +119,4 @@ mapreg_db: mapreg
 //Use SQL item_db, mob_db and mob_skill_db for the map server
 use_sql_db: no
 
-// Nick for sending mainchat 
-// messages like whisper
-main_chat_nick: Main
-
 import: conf/import/inter_conf.txt