dtype repair to logger

master
Master 2020-06-20 20:25:45 -04:00
parent 839c3d398a
commit d636ece26a
8 changed files with 11 additions and 9 deletions

View File

@ -39,7 +39,7 @@ int main( int argc, char * argv[] )
bool show_help = false; bool show_help = false;
// indicator of whether examplar should use a commandline argument for overriding the context // indicator of whether examplar should use a commandline argument for overriding the context
// instead of what's supplied in the conf file // instead of what's supplied in the test file
bool cli_context_supplied = false; bool cli_context_supplied = false;
std::string config_path = "/etc/Examplar/config.json"; std::string config_path = "/etc/Examplar/config.json";
@ -104,8 +104,10 @@ int main( int argc, char * argv[] )
if ( verbose ) if ( verbose )
{ {
L_LEVEL = E_DEBUG; L_LEVEL = E_DEBUG;
std::cout << "Verbosity is DBUG." << std::endl;
} else { } else {
L_LEVEL = E_INFO; L_LEVEL = E_INFO;
std::cout << "Verbosity is INFO." << std::endl;
} }
Logger slog = Logger( L_LEVEL, "Examplar" ); Logger slog = Logger( L_LEVEL, "Examplar" );
@ -126,7 +128,7 @@ int main( int argc, char * argv[] )
// if the user set this option as a commandline argument // if the user set this option as a commandline argument
if ( cli_context_supplied ) if ( cli_context_supplied )
{ {
// override the conf file's specified execution context // override the test file's specified execution context
configuration.set_execution_context( execution_context ); configuration.set_execution_context( execution_context );
slog.log( E_DEBUG, "Set execution context from commandline: " + execution_context ); slog.log( E_DEBUG, "Set execution context from commandline: " + execution_context );
} }

View File

@ -7,10 +7,10 @@
Logger::Logger( int LOG_LEVEL, std::string mask ) Logger::Logger( int LOG_LEVEL, std::string mask )
{ {
this->LOG_LEVEL = LOG_LEVEL; this->LOG_LEVEL = LOG_LEVEL;
this->mask = mask.c_str(); this->mask = mask;
setlogmask( LOG_UPTO( this->LOG_LEVEL ) ); setlogmask( LOG_UPTO( this->LOG_LEVEL ) );
openlog( this->mask, LOG_CONS | LOG_PID | LOG_NDELAY, LOG_PERROR | LOG_LOCAL1 ); openlog( this->mask.c_str(), LOG_CONS | LOG_PID | LOG_NDELAY, LOG_PERROR | LOG_LOCAL1 );
} }

View File

@ -13,9 +13,9 @@
#include <sstream> #include <sstream>
enum L_LVL { enum L_LVL {
E_INFO,
E_FATAL, E_FATAL,
E_WARN, E_WARN,
E_INFO,
E_DEBUG E_DEBUG
}; };
@ -26,7 +26,7 @@ public:
private: private:
int LOG_LEVEL; int LOG_LEVEL;
const char * mask; std::string mask;
std::string get_8601(); std::string get_8601();
}; };

View File

@ -66,7 +66,7 @@ protected:
/// TODO Expand to detect when a directory path is supplied for units_path or plan_path and import all Tasks and Units. /// TODO Expand to detect when a directory path is supplied for units_path or plan_path and import all Tasks and Units.
/// ///
/// \param filename - The filename to load the configuration from. /// \param filename - The filename to load the configuration from.
Conf::Conf( std::string filename, int LOG_LEVEL ): JSON_Loader( LOG_LEVEL ), slog( LOG_LEVEL, "examplar::conf" ) Conf::Conf( std::string filename, int LOG_LEVEL ): JSON_Loader( LOG_LEVEL ), slog( LOG_LEVEL, "examplar::test" )
{ {
this->LOG_LEVEL = LOG_LEVEL; this->LOG_LEVEL = LOG_LEVEL;
@ -74,7 +74,7 @@ Conf::Conf( std::string filename, int LOG_LEVEL ): JSON_Loader( LOG_LEVEL ), slo
this->override_context = false; this->override_context = false;
try { try {
// load the conf file. // load the test file.
this->load_json_file( filename ); this->load_json_file( filename );
} }
catch (std::exception) { catch (std::exception) {

View File

@ -1,6 +1,6 @@
{ {
"execution_context_override": true, "execution_context_override": true,
"execution_context": "/home/phanes/development/internal/Examplar/conf/", "execution_context": "/home/bagira/development/internal/examplar/test",
"units_path": "units/all_test.units", "units_path": "units/all_test.units",
"plan_path": "plans/test.plan", "plan_path": "plans/test.plan",
"config_version": "3", "config_version": "3",