Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
b47a70ba
Commit
b47a70ba
authored
6 years ago
by
Nick Draper
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Framework/Kernel/inc/MantidKernel/ConfigService.h
+0
-2
0 additions, 2 deletions
Framework/Kernel/inc/MantidKernel/ConfigService.h
Framework/Kernel/src/ConfigService.cpp
+3
-28
3 additions, 28 deletions
Framework/Kernel/src/ConfigService.cpp
with
3 additions
and
30 deletions
Framework/Kernel/inc/MantidKernel/ConfigService.h
+
0
−
2
View file @
b47a70ba
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Framework/Kernel/src/ConfigService.cpp
+
3
−
28
View file @
b47a70ba
...
@@ -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
//-------------------------------
//-------------------------------
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment