|
@@ -7,7 +7,7 @@ import java.util.regex.Matcher;
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
|
public class LMSensor extends Sensor {
|
|
|
-
|
|
|
+
|
|
|
public static final String REGEX = "(.*):\\s*([\\+\\-][\\d\\.]*).C";
|
|
|
|
|
|
@Override
|
|
@@ -21,15 +21,12 @@ public class LMSensor extends Sensor {
|
|
|
}
|
|
|
|
|
|
BufferedReader stdoutReader = new BufferedReader(new InputStreamReader(proc.getInputStream()));
|
|
|
- Pattern p = Pattern.compile(REGEX, Pattern.MULTILINE);
|
|
|
- StringBuilder sb = new StringBuilder();
|
|
|
+ Pattern p = Pattern.compile(REGEX);
|
|
|
String line;
|
|
|
while ((line = stdoutReader.readLine()) != null) {
|
|
|
- sb.append(line + '\n');
|
|
|
- }
|
|
|
- Matcher m = p.matcher(sb);
|
|
|
- while (m.find()) {
|
|
|
- temperatures.put(m.group(1), Double.valueOf(m.group(2)));
|
|
|
+ Matcher m = p.matcher(line);
|
|
|
+ if (m.find())
|
|
|
+ temperatures.put(m.group(1), Double.valueOf(m.group(2)));
|
|
|
}
|
|
|
}
|
|
|
|