diff options
Diffstat (limited to 'parameter/ParameterMgr.cpp')
| -rw-r--r-- | parameter/ParameterMgr.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/parameter/ParameterMgr.cpp b/parameter/ParameterMgr.cpp index cff2b47..4e6e4da 100644 --- a/parameter/ParameterMgr.cpp +++ b/parameter/ParameterMgr.cpp @@ -332,19 +332,21 @@ bool CParameterMgr::load(string& strError) // Back synchronization for areas in parameter blackboard not covered by any domain CBackSynchronizer* pBackSynchronizer = createBackSynchronizer(strError); - log("Main blackboard back synchronization"); - // Back-synchronize - if (!pBackSynchronizer->sync()) { - // Get rid of back synchronizer - delete pBackSynchronizer; + { + CAutoLog autoLog(this, "Main blackboard back synchronization"); - strError = "Main blackboard back synchronization failed: " + strError; + if (!pBackSynchronizer->sync()) { + // Get rid of back synchronizer + delete pBackSynchronizer; - return false; + strError = "Main blackboard back synchronization failed: " + strError; + + return false; + } + // Get rid of back synchronizer + delete pBackSynchronizer; } - // Get rif of back synchronizer - delete pBackSynchronizer; // We're done loading the settings and back synchronizing CConfigurableDomains* pConfigurableDomains = getConfigurableDomains(); @@ -420,7 +422,7 @@ bool CParameterMgr::loadStructure(string& strError) // Parse Structure XML file CXmlParameterSerializingContext parameterBuildContext(strError); - log("Importing system structure from file %s", strXmlStructureFilePath.c_str()); + CAutoLog autolog(pSystemClass, "Importing system structure from file " + strXmlStructureFilePath); if (!xmlParse(parameterBuildContext, pSystemClass, strXmlStructureFilePath, strXmlStructureFolder, EParameterCreationLibrary)) { |