database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Merge pull request #855 from mariadb-corporation/move-etc

Browse Source 
Move config files
This commit is contained in:
benthompson15
2019-09-09 15:54:30 -05:00
committed by GitHub
parent b727e37b98 97bda78c3b
commit 24e1c3ff2d
67 changed files with 535 additions and 5808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/loggingcpp/CMakeLists.txt
View File

@ -30,5 +30,5 @@ set_target_properties(loggingcpp PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS loggingcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
install(FILES MessageFile.txt ErrorMessage.txt DESTINATION ${ENGINE_ETCDIR} COMPONENT platform)
install(FILES MessageFile.txt ErrorMessage.txt DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT platform)

3
utils/loggingcpp/idberrorinfo.cpp
View File

@ -34,6 +34,7 @@ using namespace std;
#include <boost/thread.hpp>
using namespace boost;
#include "config.h"
#include "configcpp.h"
using namespace config;
#include "loggingid.h"
@ -64,7 +65,7 @@ IDBErrorInfo::IDBErrorInfo()
string configFile(cf->getConfig("SystemConfig", "ErrorMessageFile"));
if (configFile.length() == 0)
configFile = startup::StartUp::installDir() + "/etc/ErrorMessage.txt";
configFile = std::string(MCSSYSCONFDIR) + "/columnstore/ErrorMessage.txt";
ifstream msgFile(configFile.c_str());

3
utils/loggingcpp/message.cpp
View File

@ -34,6 +34,7 @@ using namespace std;
#include <boost/thread.hpp>
using namespace boost;
#include "config.h"
#include "configcpp.h"
using namespace config;
#include "messageobj.h"
@ -56,7 +57,7 @@ void loadCatalog()
string configFile(cf->getConfig("MessageLog", "MessageLogFile"));
if (configFile.length() == 0)
configFile = startup::StartUp::installDir() + "/etc/MessageFile.txt";
configFile = std::string(MCSSYSCONFDIR) + "/columnstore/MessageFile.txt";
ifstream msgFile(configFile.c_str());