Skip to content

Commit 5ea603f

Browse files
author
Marcus O'Flaherty
committed
remove logging verbosity indicator, add verbosity constants
1 parent 6100b07 commit 5ea603f

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

src/Logging/Logging.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ int Logging::MyStreamBuf::sync ( )
4141

4242

4343
if(m_mode=="Local"){
44-
output<< "{"<<t<<"} ["<<m_messagelevel<<"]: " << str();
44+
//output<< "{"<<t<<"} ["<<m_messagelevel<<"]: " << str();
45+
output<<str();
4546
str("");
4647
output.flush();
4748

@@ -65,7 +66,8 @@ int Logging::MyStreamBuf::sync ( )
6566
6667
output<<"\033[38;5;"<<code<<"m["<<m_messagelevel<<"]: " << str()<<"\033[0m";
6768
*/
68-
output<<"["<<m_messagelevel<<"]: " << str();
69+
//output<<"["<<m_messagelevel<<"]: " << str();
70+
output<<str();
6971
str("");
7072
output.flush();
7173
}

src/Tool/Tool.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ class Tool{
2424
virtual bool Finalise()=0; ///< Virtual Finalise function.
2525
virtual ~Tool(){}; ///< virtual destructor.
2626

27+
std::string m_unique_name;
28+
2729
protected:
2830

2931
Store m_variables; ///< Store used to store configuration varaibles
@@ -35,13 +37,15 @@ class Tool{
3537
template <typename T> void Log(T message, int messagelevel=1, int verbosity=1){m_data->Log->Log(message,messagelevel,verbosity);}
3638
template <typename T> void Log(T message, int messagelevel){m_data->Log->Log(message,messagelevel,m_verbose);} ///< Logging fuction for printouts. @param message Templated message string. @param messagelevel The verbosity level at which to show the message. Checked against internal verbosity level
3739

38-
40+
int get_ok;
41+
static const int v_error=0;
42+
static const int v_warning=1;
43+
static const int v_message=2;
44+
static const int v_debug=3;
3945
private:
4046

4147

4248

43-
44-
4549
};
4650

4751
#endif

src/ToolChain/ToolChain.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ void ToolChain::Add(std::string name,Tool *tool,std::string configfile){
126126
m_data.Log->Log(logmessage.str(),1,m_verbose);
127127
logmessage.str("");
128128

129+
tool->m_unique_name = name;
129130
m_tools.push_back(tool);
130131
m_toolnames.push_back(name);
131132
m_configfiles.push_back(configfile);

0 commit comments

Comments
 (0)