summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel M. Pelt <D.M.Pelt@cwi.nl>2015-03-13 17:22:41 +0100
committerDaniel M. Pelt <D.M.Pelt@cwi.nl>2015-03-13 17:26:35 +0100
commit35fadf8641b05d357a37e8098b9a801ba0e815b9 (patch)
tree941eb461bb05065ce2dfcbf3dc423b19748d17ed
parentf21700e00e81538d5510973a51b8ae97fb4a24dd (diff)
downloadastra-35fadf8641b05d357a37e8098b9a801ba0e815b9.tar.gz
astra-35fadf8641b05d357a37e8098b9a801ba0e815b9.tar.bz2
astra-35fadf8641b05d357a37e8098b9a801ba0e815b9.tar.xz
astra-35fadf8641b05d357a37e8098b9a801ba0e815b9.zip
Use a less verbose default fmt for screen logging and cleaner messages
-rw-r--r--include/astra/clog.h8
-rw-r--r--src/Config.cpp2
-rw-r--r--src/CudaForwardProjectionAlgorithm.cpp2
-rw-r--r--src/CudaReconstructionAlgorithm2D.cpp2
-rw-r--r--src/Logging.cpp1
5 files changed, 8 insertions, 7 deletions
diff --git a/include/astra/clog.h b/include/astra/clog.h
index 3b7e18b..ce082df 100644
--- a/include/astra/clog.h
+++ b/include/astra/clog.h
@@ -299,10 +299,10 @@ extern struct clog *_clog_loggers[CLOG_MAX_LOGGERS];
#ifdef CLOG_MAIN
const char *const CLOG_LEVEL_NAMES[] = {
- "DEBUG",
- "INFO",
- "WARN",
- "ERROR",
+ "Debug",
+ "Info",
+ "Warning",
+ "Error",
};
int
diff --git a/src/Config.cpp b/src/Config.cpp
index 388cfdf..d860638 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -148,7 +148,7 @@ bool ConfigStackCheck<T>::stopParsing()
if (!errors.empty()) {
ostringstream os;
- os << "Warning: " << name << ": unused configuration options: " << errors;
+ os << name << ": unused configuration options: " << errors;
ASTRA_WARN(os.str().c_str());
return false;
}
diff --git a/src/CudaForwardProjectionAlgorithm.cpp b/src/CudaForwardProjectionAlgorithm.cpp
index 19cadd6..95abb62 100644
--- a/src/CudaForwardProjectionAlgorithm.cpp
+++ b/src/CudaForwardProjectionAlgorithm.cpp
@@ -106,7 +106,7 @@ bool CCudaForwardProjectionAlgorithm::initialize(const Config& _cfg)
id = boost::lexical_cast<int>(node->getContent());
CProjector2D *projector = CProjector2DManager::getSingleton().get(id);
if (!dynamic_cast<CCudaProjector2D*>(projector)) {
- ASTRA_WARN("Warning: non-CUDA Projector2D passed to FP_CUDA");
+ ASTRA_WARN("non-CUDA Projector2D passed to FP_CUDA");
}
delete node;
}
diff --git a/src/CudaReconstructionAlgorithm2D.cpp b/src/CudaReconstructionAlgorithm2D.cpp
index 929f0f1..1c6b763 100644
--- a/src/CudaReconstructionAlgorithm2D.cpp
+++ b/src/CudaReconstructionAlgorithm2D.cpp
@@ -178,7 +178,7 @@ bool CCudaReconstructionAlgorithm2D::initialize(const Config& _cfg)
id = boost::lexical_cast<int>(node->getContent());
CProjector2D *projector = CProjector2DManager::getSingleton().get(id);
if (!dynamic_cast<CCudaProjector2D*>(projector)) {
- ASTRA_WARN("Warning: non-CUDA Projector2D passed");
+ ASTRA_WARN("non-CUDA Projector2D passed");
}
delete node;
}
diff --git a/src/Logging.cpp b/src/Logging.cpp
index 9d7c219..f95df0e 100644
--- a/src/Logging.cpp
+++ b/src/Logging.cpp
@@ -146,6 +146,7 @@ void CLogger::_assureIsInitialized()
{
clog_init_fd(0, 2);
clog_set_level(0, CLOG_INFO);
+ clog_set_fmt(0, "%l: %m\n");
m_bInitialized = true;
}
}