Skip to content
Snippets Groups Projects
Commit b47a70ba authored by Nick Draper's avatar Nick Draper
Browse files

Remove default .properties cofiguration which didn't work anyway

re #23102
parent a878f446
No related branches found
No related tags found
No related merge requests found
...@@ -266,8 +266,6 @@ private: ...@@ -266,8 +266,6 @@ private:
/// Read a file and place its contents into the given string /// Read a file and place its contents into the given string
bool readFile(const std::string &filename, std::string &contents) const; bool readFile(const std::string &filename, std::string &contents) const;
/// Provides a string of a default configuration
std::string defaultConfig() const;
/// Writes out a fresh user properties file /// Writes out a fresh user properties file
void createUserPropertiesFile() const; void createUserPropertiesFile() const;
/// Convert any relative paths to absolute ones and store them locally so that /// Convert any relative paths to absolute ones and store them locally so that
......
...@@ -367,11 +367,9 @@ void ConfigServiceImpl::loadConfig(const std::string &filename, ...@@ -367,11 +367,9 @@ void ConfigServiceImpl::loadConfig(const std::string &filename,
} catch (std::exception &e) { } catch (std::exception &e) {
// there was a problem loading the file - it probably is not there // there was a problem loading the file - it probably is not there
std::cerr << "Problem loading the configuration file " << filename << " " std::cerr << "Problem loading the configuration file " << filename << " "
<< e.what() << '\n'; << e.what() << '\n';
if (!append) { std::cerr << "Mantid is unable to start.\n" << std::endl;
// if we have no property values then take the default throw;
m_PropertyString = defaultConfig();
}
} }
// use the cached property string to initialise the POCO property file // use the cached property string to initialise the POCO property file
...@@ -657,29 +655,6 @@ void ConfigServiceImpl::createUserPropertiesFile() const { ...@@ -657,29 +655,6 @@ void ConfigServiceImpl::createUserPropertiesFile() const {
} }
} }
/**
* Provides a default Configuration string to use if the config file cannot be
* loaded.
* @returns The string value of default properties
*/
std::string ConfigServiceImpl::defaultConfig() const {
std::string propFile =
"# logging configuration"
"# root level message filter (drop to debug for more messages)"
"logging.loggers.root.level = notice"
"# splitting the messages to many logging channels"
"logging.loggers.root.channel.class = SplitterChannel"
"logging.loggers.root.channel.channel1 = consoleChannel"
"# output to the console - primarily for console based apps"
"logging.channels.consoleChannel.class = ConsoleChannel"
"logging.channels.consoleChannel.formatter = f1"
"# specfic filter for the file channel raising the level to warning "
"logging.formatters.f1.class = PatternFormatter"
"logging.formatters.f1.pattern = %s-[%p] %t"
"logging.formatters.f1.times = UTC";
return propFile;
}
//------------------------------- //-------------------------------
// Public member functions // Public member functions
//------------------------------- //-------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment