diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-27 12:40:29 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-27 12:40:29 +0000 |
| commit | 807577cbc6c8e93e99ab4140789babaae10be279 (patch) | |
| tree | 238efb9c21709092c71ab6a9fbf6c8a36126102d /src/map | |
| parent | ecbb7655309ca4cda4b4cf2b92e1c52e250505e2 (diff) | |
| download | hercules-807577cbc6c8e93e99ab4140789babaae10be279.tar.gz hercules-807577cbc6c8e93e99ab4140789babaae10be279.tar.bz2 hercules-807577cbc6c8e93e99ab4140789babaae10be279.tar.xz hercules-807577cbc6c8e93e99ab4140789babaae10be279.zip | |
Cleaned up several poorly chosen loginlog variable names.
Removed the unused login and txt->sql options in inter_athena.conf.
Renamed config option log_db to log_db_db in inter_athena.conf.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13005 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/map.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/map/map.c b/src/map/map.c index 8c80644d0..3f34f9661 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -74,7 +74,7 @@ char log_db_ip[32] = "127.0.0.1"; int log_db_port = 3306; char log_db_id[32] = "ragnarok"; char log_db_pw[32] = "ragnarok"; -char log_db[32] = "log"; +char log_db_db[32] = "log"; Sql* logmysql_handle; #endif /* not TXT_ONLY */ @@ -2984,18 +2984,16 @@ int inter_config_read(char *cfgName) } else if(strcmpi(w1,"use_sql_db")==0){ db_use_sqldbs = config_switch(w2); ShowStatus ("Using SQL dbs: %s\n",w2); - } else if(strcmpi(w1,"log_db")==0) { - strcpy(log_db, w2); } else if(strcmpi(w1,"log_db_ip")==0) { strcpy(log_db_ip, w2); - } else if(strcmpi(w1,"log_db")==0) { - strcpy(log_db, w2); } else if(strcmpi(w1,"log_db_id")==0) { strcpy(log_db_id, w2); } else if(strcmpi(w1,"log_db_pw")==0) { strcpy(log_db_pw, w2); } else if(strcmpi(w1,"log_db_port")==0) { log_db_port = atoi(w2); + } else if(strcmpi(w1,"log_db_db")==0) { + strcpy(log_db_db, w2); #endif //support the import command, just like any other config } else if(strcmpi(w1,"import")==0){ @@ -3049,10 +3047,10 @@ int log_sql_init(void) // log db connection logmysql_handle = Sql_Malloc(); - ShowInfo(""CL_WHITE"[SQL]"CL_RESET": Connecting to the Log Database "CL_WHITE"%s"CL_RESET" At "CL_WHITE"%s"CL_RESET"...\n",log_db,log_db_ip); - if ( SQL_ERROR == Sql_Connect(logmysql_handle, log_db_id, log_db_pw, log_db_ip, log_db_port, log_db) ) + ShowInfo(""CL_WHITE"[SQL]"CL_RESET": Connecting to the Log Database "CL_WHITE"%s"CL_RESET" At "CL_WHITE"%s"CL_RESET"...\n",log_db_db,log_db_ip); + if ( SQL_ERROR == Sql_Connect(logmysql_handle, log_db_id, log_db_pw, log_db_ip, log_db_port, log_db_db) ) exit(EXIT_FAILURE); - ShowStatus(""CL_WHITE"[SQL]"CL_RESET": Successfully '"CL_GREEN"connected"CL_RESET"' to Database '"CL_WHITE"%s"CL_RESET"'.\n", log_db); + ShowStatus(""CL_WHITE"[SQL]"CL_RESET": Successfully '"CL_GREEN"connected"CL_RESET"' to Database '"CL_WHITE"%s"CL_RESET"'.\n", log_db_db); if( strlen(default_codepage) > 0 ) if ( SQL_ERROR == Sql_SetEncoding(logmysql_handle, default_codepage) ) |