Make SEL logging a config option.

Author: jtikalsky

Crate.cpp

@@ -158,37 +158,37 @@ int crate__parse_sel_cb(ipmi_sel_ctx_t ctx, void *cb_crate)
 
 	int rv;
 
-#ifdef PRINT_SEL
-	/*
-	 * Print out Event String for debug/testing
-	 */
+	if (crate->log_sel) {
+		/*
+		 * Print out Event String for debug/testing
+		 */
 
-	// FreeIPMI Library TRACE build option override
-	//
-	// Really, lets just not get this stupid error message.
-	// We NEVER care.
-	//int olderr = dup(2);
-	//close(2);
-	//open("/dev/null", O_WRONLY);
+		// FreeIPMI Library TRACE build option override
+		//
+		// Really, lets just not get this stupid error message.
+		// We NEVER care.
+		//int olderr = dup(2);
+		//close(2);
+		//open("/dev/null", O_WRONLY);
 
-	char eventstring[1024];
-	rv = ipmi_sel_parse_read_record_string(ctx,
+		char eventstring[1024];
+		rv = ipmi_sel_parse_read_record_string(ctx,
 				"%i: %d %t: %T sensor %s %k: %e",
 				NULL,
 				0,
 				eventstring,
 				1024,
 				IPMI_SEL_STRING_FLAGS_VERBOSE|IPMI_SEL_STRING_FLAGS_OUTPUT_NOT_AVAILABLE|IPMI_SEL_STRING_FLAGS_IGNORE_UNAVAILABLE_FIELD);
 
-	// And restore stderr before going ANY farther.
-	//dup2(olderr, 2);
-	//close(olderr);
+		// And restore stderr before going ANY farther.
+		//dup2(olderr, 2);
+		//close(olderr);
 
-	if (rv < 0)
-		RETMSG(-1, "ipmi_sel_parse_read_record_string() failed: (%d) %s", ipmi_sel_ctx_errnum(ctx), ipmi_sel_ctx_strerror(ipmi_sel_ctx_errnum(ctx)));
-	if (rv >= 0)
-		mprintf("C%d: %s\n", CRATE_NO, eventstring);
-#endif
+		if (rv < 0)
+			RETMSG(-1, "ipmi_sel_parse_read_record_string() failed: (%d) %s", ipmi_sel_ctx_errnum(ctx), ipmi_sel_ctx_strerror(ipmi_sel_ctx_errnum(ctx)));
+		if (rv >= 0)
+			mprintf("C%d: SEL Entry: %s\n", CRATE_NO, eventstring);
+	}
 
 	uint16_t record_id;
 	rv = ipmi_sel_parse_read_record_id(ctx, NULL, 0, &record_id);

Crate.h

@@ -45,6 +45,7 @@ class Crate {
 		char *pass;
 		uint8_t ipmi15_authentication_type;
 		std::string description;
+		bool log_sel;
 
 		TaskQueue::taskid_t selscan_id;
 		TaskQueue::taskid_t sdrscan_id;
@@ -69,8 +70,8 @@ class Crate {
 				void *cb_data);
 
 	public:
-		Crate(uint8_t number, enum Mfgr MCH, std::string ip, const char *user, const char *pass, uint8_t ipmi15_authentication_type, std::string description)
-			: number(number), MCH(MCH), ip(ip), ipmi15_authentication_type(ipmi15_authentication_type), description(description), selscan_id(0), sdrscan_id(0), selscan_lastclr(0), selscan_nextent(0), force_sdr_scan(false), sdr_scan_retries(0), sendmessage_seq(0) {
+		Crate(uint8_t number, enum Mfgr MCH, std::string ip, const char *user, const char *pass, uint8_t ipmi15_authentication_type, std::string description, bool log_sel)
+			: number(number), MCH(MCH), ip(ip), ipmi15_authentication_type(ipmi15_authentication_type), description(description), log_sel(log_sel), selscan_id(0), sdrscan_id(0), selscan_lastclr(0), selscan_nextent(0), force_sdr_scan(false), sdr_scan_retries(0), sendmessage_seq(0) {
 				memset(&this->ctx, 0, sizeof(this->ctx));
 				memset(&this->cards, 0, sizeof(this->cards));
 				memset(&this->sdrfile, 0, sizeof(this->sdrfile));

sysmgr.cpp

@@ -285,6 +285,7 @@ int main(int argc, char *argv[])
 		CFG_INT_CB(const_cast<char *>("authtype"), 0, CFGF_NONE, cfg_parse_authtype),
 		CFG_INT_CB(const_cast<char *>("mch"), 0, CFGF_NONE, cfg_parse_MCH),
 		CFG_BOOL(const_cast<char *>("enabled"), cfg_true, CFGF_NONE),
+		CFG_BOOL(const_cast<char *>("log_sel"), cfg_false, CFGF_NONE),
 		CFG_END()
 	};
 
@@ -347,7 +348,7 @@ int main(int argc, char *argv[])
 		const char *user = cfg_getstr(cfgcrate, "username");
 		const char *pass = cfg_getstr(cfgcrate, "password");
 
-		Crate *crate = new Crate(i+1, MCH, cfg_getstr(cfgcrate, "host"), (user[0] ? user : NULL), (pass[0] ? pass : NULL), cfg_getint(cfgcrate, "authtype"), cfg_getstr(cfgcrate, "description"));
+		Crate *crate = new Crate(i+1, MCH, cfg_getstr(cfgcrate, "host"), (user[0] ? user : NULL), (pass[0] ? pass : NULL), cfg_getint(cfgcrate, "authtype"), cfg_getstr(cfgcrate, "description"), (cfg_getbool(cfgcrate, "log_sel") == cfg_true));
 
 		bool enabled = (cfg_getbool(cfgcrate, "enabled") == cfg_true);
 		if (enabled)

sysmgr.example.tmpl.conf

@@ -26,6 +26,7 @@ crate {
 	password = "vadatech"
 	authtype = none # NONE MD2 MD5 STRAIGHT_PASSWORD_KEY
 	description = "Left Crate"
+	log_sel = false
 }
 
 crate {
@@ -35,6 +36,7 @@ crate {
 	password = "vadatech"
 	authtype = none
 	description = "Right Crate"
+	log_sel = false
 	enabled = false
 }
 
@@ -45,6 +47,7 @@ crate {
 	password = ""
 	authtype = none
 	description = "Spare Crate"
+	log_sel = false
 	enabled = false
 }
 

sysmgr.h

@@ -7,7 +7,6 @@
 #undef	DEBUG_ONESHOT
 #undef	DEBUG_OUTPUT
 #undef	DEBUG_SOCKET_FLOW
-#undef	PRINT_SEL
 #define	ABSOLUTE_HOTSWAP // Check sensor value, not event data.
 
 #define CONFIG_PATH "/etc/sysmgr"