Skip to content

Commit

Permalink
issue #31
Browse files Browse the repository at this point in the history
Enhancement: part of configuration is not written both on console and in the log file
  • Loading branch information
dimamih authored and isvasia committed Feb 26, 2018
1 parent 4c69d01 commit 6921d04
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
function SInput=patch_007_change_logging_settings_part2(~,SInput)
aCVec = sprintf([...
'log4j.rootLogger = DEBUG, stdout, A1\n'...
'log4j.logger.elltool = WARN, stdout\n'...
'log4j.logger.gras = WARN, stdout\n'...
'log4j.logger.modgen = WARN, stdout\n'...
'log4j.logger.smartdb = WARN, stdout\n'...
'log4j.logger.elltool = DEBUG, A1\n'...
'log4j.additivity.elltool = FALSE\n'...
'log4j.logger.gras = DEBUG, A1\n'...
'log4j.additivity.gras = FALSE\n'...
'log4j.logger.modgen = DEBUG, A1\n'...
'log4j.additivity.modgen = FALSE\n'...
'log4j.logger.smartdb = DEBUG, A1\n'...
'log4j.additivity.smartdb = FALSE\n'...
'log4j.logger.gras.ellapx.uncertcalc.run.saveConf = WARN, A1\n'...
'log4j.logger.modgen.mlunit.run_tests_remotely = INFO, stdout, A1\n'...
'log4j.additivity.modgen.mlunit.run_tests_remotely = FALSE\n'...
'log4j.logger.logging.EmailLogger.EmailLogger = INFO, stdout, A1\n'...
'log4j.additivity.logging.EmailLogger.EmailLogger = FALSE\n'...
'log4j.appender.stdout=org.apache.log4j.ConsoleAppender\n'...
'log4j.appender.stdout.layout=org.apache.log4j.PatternLayout\n'...
'log4j.appender.stdout.layout.ConversionPattern=%%5p %%c - %%m\\n \n'...
'log4j.appender.A1=org.apache.log4j.FileAppender\n'...
'log4j.appender.A1.File=${elltool.testrunner.log4j.logfile.dirwithsep}${elltool.testrunner.log4j.logfile.main.name}\n'...
'log4j.appender.A1.layout=org.apache.log4j.PatternLayout\n'...
'log4j.appender.A1.layout.ConversionPattern=%%d %%5p %%c - %%m%%n']);
SInput.logging.log4jSettings = aCVec;
4 changes: 2 additions & 2 deletions products/+gras/+ellapx/+uncertcalc/run.m
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ function saveConf(sysConfRepoMgr,confRepoMgr,resDir)
convertConf2Text(SSysDefConf,sysDefFileName);
function SConf=getSmartConfInternal(confRepoMgr,confType)
import gras.ellapx.uncertcalc.log.Log4jConfigurator;
logger=Log4jConfigurator.getLogger();
logger=Log4jConfigurator.getLogger('saveConf',true);
[SConf,confVersion]=confRepoMgr.getCurConf();
inpArgList={struct('conf',SConf,'version',confVersion)}; %#ok<NASGU>
confStr=evalc('convertConf2Text(inpArgList{:})');
Expand All @@ -149,6 +149,6 @@ function saveConf(sysConfRepoMgr,confRepoMgr,resDir)
function convertConf2Text(SConf,varargin)
import modgen.struct.strucdisp;
import gras.ellapx.uncertcalc.log.Log4jConfigurator;
logger=Log4jConfigurator.getLogger();
logger=Log4jConfigurator.getLogger('saveConf',true);
logger.info(strucdisp(SConf,varargin{:},'depth',-1,'maxArrayLength',1000));
end
4 changes: 2 additions & 2 deletions products/+gras/+ellapx/+uncertmixcalc/run.m
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function saveConf(sysConfRepoMgr,confRepoMgr,resDir)
convertConf2Text(SSysDefConf,sysDefFileName);
function SConf=getSmartConfInternal(confRepoMgr,confType)
import gras.ellapx.uncertcalc.log.Log4jConfigurator;
logger=Log4jConfigurator.getLogger();
logger=Log4jConfigurator.getLogger('saveConf',true);
[SConf,confVersion]=confRepoMgr.getCurConf();
inpArgList={struct('conf',SConf,'version',confVersion)}; %#ok<NASGU>
confStr=evalc('convertConf2Text(inpArgList{:})');
Expand All @@ -136,6 +136,6 @@ function saveConf(sysConfRepoMgr,confRepoMgr,resDir)
function convertConf2Text(SConf,varargin)
import modgen.struct.strucdisp;
import gras.ellapx.uncertcalc.log.Log4jConfigurator;
logger=Log4jConfigurator.getLogger();
logger=Log4jConfigurator.getLogger('saveConf',true);
logger.info(strucdisp(SConf,varargin{:},'depth',-1,'maxArrayLength',1000));
end

0 comments on commit 6921d04

Please sign in to comment.