* Remove ConfVersion from the config files. It is considered the end-user's responsibility to check for config file changes.
--HG-- branch : trunk
This commit is contained in:
@@ -37,12 +37,6 @@
|
|||||||
# define _TRINITY_CORE_CONFIG "TrinityCore.conf"
|
# define _TRINITY_CORE_CONFIG "TrinityCore.conf"
|
||||||
#endif //_TRINITY_CORE_CONFIG
|
#endif //_TRINITY_CORE_CONFIG
|
||||||
|
|
||||||
// Format is YYYYMMDDRR where RR is the change in the conf file
|
|
||||||
// for that day.
|
|
||||||
#ifndef _TRINITY_CORE_CONFVER
|
|
||||||
# define _TRINITY_CORE_CONFVER 2009101701
|
|
||||||
#endif //_TRINITY_CORE_CONFVER
|
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#include "ServiceWin32.h"
|
#include "ServiceWin32.h"
|
||||||
char serviceName[] = "TrinityCore";
|
char serviceName[] = "TrinityCore";
|
||||||
@@ -144,18 +138,6 @@ extern int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
sLog.outString("Using configuration file %s.", cfg_file);
|
sLog.outString("Using configuration file %s.", cfg_file);
|
||||||
|
|
||||||
uint32 confVersion = sConfig.GetIntDefault("ConfVersion", 0);
|
|
||||||
if (confVersion < _TRINITY_CORE_CONFVER)
|
|
||||||
{
|
|
||||||
sLog.outError("*****************************************************************************");
|
|
||||||
sLog.outError(" WARNING: Your trinitycore.conf version indicates your conf file is out of date!");
|
|
||||||
sLog.outError(" Please check for updates, as your current default values may cause");
|
|
||||||
sLog.outError(" strange behavior.");
|
|
||||||
sLog.outError("*****************************************************************************");
|
|
||||||
clock_t pause = 3000 + clock();
|
|
||||||
while (pause > clock()) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
sLog.outDetail("%s (Library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
|
sLog.outDetail("%s (Library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
|
||||||
if (SSLeay() < 0x009080bfL )
|
if (SSLeay() < 0x009080bfL )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
##########################################
|
##########################################
|
||||||
# Trinity Core worldd configuration file #
|
# Trinity Core worldd configuration file #
|
||||||
##########################################
|
##########################################
|
||||||
ConfVersion=2009122101
|
|
||||||
|
|
||||||
###################################################################################################################
|
###################################################################################################################
|
||||||
# CONNECTIONS AND DIRECTORIES
|
# CONNECTIONS AND DIRECTORIES
|
||||||
|
|||||||
@@ -35,12 +35,6 @@
|
|||||||
#include <openssl/opensslv.h>
|
#include <openssl/opensslv.h>
|
||||||
#include <openssl/crypto.h>
|
#include <openssl/crypto.h>
|
||||||
|
|
||||||
// Format is YYYYMMDDRR where RR is the change in the conf file
|
|
||||||
// for that day.
|
|
||||||
#ifndef _REALMDCONFVERSION
|
|
||||||
# define _REALMDCONFVERSION 2009081701
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef _TRINITY_REALM_CONFIG
|
#ifndef _TRINITY_REALM_CONFIG
|
||||||
# define _TRINITY_REALM_CONFIG "TrinityRealm.conf"
|
# define _TRINITY_REALM_CONFIG "TrinityRealm.conf"
|
||||||
#endif //_TRINITY_REALM_CONFIG
|
#endif //_TRINITY_REALM_CONFIG
|
||||||
@@ -154,20 +148,6 @@ extern int main(int argc, char **argv)
|
|||||||
sLog.outString("<Ctrl-C> to stop.\n");
|
sLog.outString("<Ctrl-C> to stop.\n");
|
||||||
sLog.outString("Using configuration file %s.", cfg_file);
|
sLog.outString("Using configuration file %s.", cfg_file);
|
||||||
|
|
||||||
///- Check the version of the configuration file
|
|
||||||
uint32 confVersion = sConfig.GetIntDefault("ConfVersion", 0);
|
|
||||||
if (confVersion < _REALMDCONFVERSION)
|
|
||||||
{
|
|
||||||
sLog.outError("*****************************************************************************");
|
|
||||||
sLog.outError(" WARNING: Your trinityrealm.conf version indicates your conf file is out of date!");
|
|
||||||
sLog.outError(" Please check for updates, as your current default values may cause");
|
|
||||||
sLog.outError(" strange behavior.");
|
|
||||||
sLog.outError("*****************************************************************************");
|
|
||||||
clock_t pause = 3000 + clock();
|
|
||||||
|
|
||||||
while (pause > clock()) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
sLog.outDetail("%s (Library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
|
sLog.outDetail("%s (Library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
|
||||||
if (SSLeay() < 0x009080bfL)
|
if (SSLeay() < 0x009080bfL)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
##########################################
|
##########################################
|
||||||
# Trinity Core realmd configuration file #
|
# Trinity Core realmd configuration file #
|
||||||
##########################################
|
##########################################
|
||||||
ConfVersion=2009081701
|
|
||||||
|
|
||||||
###################################################################################################################
|
###################################################################################################################
|
||||||
# REALMD SETTINGS
|
# REALMD SETTINGS
|
||||||
|
|||||||
Reference in New Issue
Block a user