phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Stop warning about missing config files.

Browse Source 
Use newer logger interface in config code.

This was SVN commit r7601.
This commit is contained in:
Ykkrosh 2010-05-31 23:01:42 +00:00
parent 65cf204423
commit ffe9241cd3
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/ps/ConfigDB.cpp
View File

@ -24,8 +24,6 @@
#include "Filesystem.h" #include "Filesystem.h"
#include "scripting/ScriptingHost.h" #include "scripting/ScriptingHost.h"
#define LOG_CATEGORY L"config"
typedef std::map <CStr, CConfigValueSet> TConfigMap; typedef std::map <CStr, CConfigValueSet> TConfigMap;
TConfigMap CConfigDB::m_Map[CFG_LAST]; TConfigMap CConfigDB::m_Map[CFG_LAST];
CStrW CConfigDB::m_ConfigFile[CFG_LAST]; CStrW CConfigDB::m_ConfigFile[CFG_LAST];
@ -278,16 +276,16 @@ bool CConfigDB::Reload(EConfigNamespace ns)
// Handle missing files quietly // Handle missing files quietly
if (g_VFS->GetFileInfo(m_ConfigFile[ns], NULL) < 0) if (g_VFS->GetFileInfo(m_ConfigFile[ns], NULL) < 0)
{ {
LOG(CLogger::Warning, LOG_CATEGORY, L"Cannot find config file \"%ls\" - ignoring", m_ConfigFile[ns].c_str()); LOGMESSAGE(L"Cannot find config file \"%ls\" - ignoring", m_ConfigFile[ns].c_str());
return false; return false;
} }
else else
{ {
LOG(CLogger::Normal, LOG_CATEGORY, L"Loading config file \"%ls\"", m_ConfigFile[ns].c_str()); LOGMESSAGE(L"Loading config file \"%ls\"", m_ConfigFile[ns].c_str());
LibError ret = g_VFS->LoadFile(m_ConfigFile[ns], buffer, buflen); LibError ret = g_VFS->LoadFile(m_ConfigFile[ns], buffer, buflen);
if (ret != INFO::OK) if (ret != INFO::OK)
{ {
LOG(CLogger::Error, LOG_CATEGORY, L"vfs_load for \"%ls\" failed: return was %ld", m_ConfigFile[ns].c_str(), ret); LOGERROR(L"CConfigDB::Reload(): vfs_load for \"%ls\" failed: return was %ld", m_ConfigFile[ns].c_str(), ret);
return false; return false;
} }
} }
@ -332,7 +330,7 @@ bool CConfigDB::Reload(EConfigNamespace ns)
CConfigValue argument; CConfigValue argument;
argument.m_String = value; argument.m_String = value;
newMap[name].push_back( argument ); newMap[name].push_back( argument );
LOG(CLogger::Normal, LOG_CATEGORY, L"Loaded config string \"%hs\" = \"%hs\"", name.c_str(), value.c_str()); LOGMESSAGE(L"Loaded config string \"%hs\" = \"%hs\"", name.c_str(), value.c_str());
} }
} }
} }
@ -365,7 +363,7 @@ bool CConfigDB::WriteFile(EConfigNamespace ns, bool useVFS, const CStrW& path)
LibError ret = g_VFS->CreateFile(path, buf, len); LibError ret = g_VFS->CreateFile(path, buf, len);
if(ret < 0) if(ret < 0)
{ {
LOG(CLogger::Error, LOG_CATEGORY, L"CConfigDB::WriteFile(): CreateFile \"%ls\" failed (error: %d)", path.c_str(), (int)ret); LOGERROR(L"CConfigDB::WriteFile(): CreateFile \"%ls\" failed (error: %d)", path.c_str(), (int)ret);
return false; return false;
} }