X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmic.c;h=570da51bcfd56c20296effdd64e570e3ff9eb6b9;hb=72a76347831a848e6722d9147297a1e03c4c01d8;hp=da58b35a76471df418e159ae5c25f7bc829adf26;hpb=ab425e20aa3557cfee0a3f689991cde4db899845;p=collectd.git

diff --git a/src/mic.c b/src/mic.c
index da58b35a..570da51b 100644
--- a/src/mic.c
+++ b/src/mic.c
@@ -53,8 +53,8 @@ static const char *config_keys[] =
 	"Temperature",
 	"IgnoreSelectedTemperature",
 	"ShowPower",
-	"PowerSensor",
-	"IgnorePowerSelected"
+	"Power",
+	"IgnoreSelectedPower"
 };
 static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
@@ -131,11 +131,11 @@ static int mic_config (const char *key, const char *value) {
 			invert = 0;
 		ignorelist_set_invert(temp_ignore,invert);
 	}
-	else if (strcasecmp("PowerSensor",key) == 0)
+	else if (strcasecmp("Power",key) == 0)
 	{
 		ignorelist_add(power_ignore,value);
 	}
-	else if (strcasecmp("IgnorePowerSelected",key) == 0)
+	else if (strcasecmp("IgnoreSelectedPower",key) == 0)
 	{
 		int invert = 1;
 		if (IS_TRUE(value))
@@ -335,9 +335,9 @@ static int mic_read_power(int mic)
 		mic_submit_power(mic,"power",#name,(gauge_t)power_use.name.prr*0.000001); \
 	} while(0)
 	#define SUB_VOLTS(name) do { if (ignorelist_match(power_ignore,#name)==0) {\
-		mic_submit_power(mic,"power",#name "-pwr",(gauge_t)(power_use.name.pwr*0.000001)); \
-		mic_submit_power(mic,"current",#name "-cur",(gauge_t)(power_use.name.cur*0.001)); \
-		mic_submit_power(mic,"voltage",#name "-volt",(gauge_t)(power_use.name.volt*0.000001)); \
+		mic_submit_power(mic,"power",#name,(gauge_t)(power_use.name.pwr*0.000001)); \
+		mic_submit_power(mic,"current",#name,(gauge_t)(power_use.name.cur*0.001)); \
+		mic_submit_power(mic,"voltage",#name,(gauge_t)(power_use.name.volt*0.000001)); \
 	}} while(0)
 
 	SUB_POWER(total0);
@@ -398,7 +398,9 @@ static int mic_read (void)
 static int mic_shutdown (void)
 {
 	if (mic_handle)
-	MicCloseAPI(&mic_handle);
+		MicCloseAPI(&mic_handle);
+	mic_handle = NULL;
+
 	return (0);
 }