*/
package org.openhab.persistence.rrd4j.internal;
-import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.time.Instant;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import org.rrd4j.core.FetchData;
import org.rrd4j.core.FetchRequest;
import org.rrd4j.core.RrdDb;
+import org.rrd4j.core.RrdDb.Builder;
+import org.rrd4j.core.RrdDbPool;
import org.rrd4j.core.RrdDef;
import org.rrd4j.core.Sample;
import org.slf4j.Logger;
private static final String DATASOURCE_STATE = "state";
- public static final String DB_FOLDER = getUserPersistenceDataFolder() + File.separator + "rrd4j";
+ private static final Path DB_FOLDER = Path.of(OpenHAB.getUserDataFolder(), "persistence", "rrd4j").toAbsolutePath();
+
+ private static final RrdDbPool DATABASE_POOL = new RrdDbPool();
private final Logger logger = LoggerFactory.getLogger(RRD4jPersistenceService.class);
private final Map<String, ScheduledFuture<?>> scheduledJobs = new HashMap<>();
- protected final ItemRegistry itemRegistry;
+ private final ItemRegistry itemRegistry;
+
+ public static Path getDatabasePath(String name) {
+ return DB_FOLDER.resolve(name + ".rrd");
+ }
+
+ public static RrdDbPool getDatabasePool() {
+ return DATABASE_POOL;
+ }
@Activate
public RRD4jPersistenceService(final @Reference ItemRegistry itemRegistry) {
return;
}
final String name = alias == null ? item.getName() : alias;
+
RrdDb db = getDB(name);
- if (db != null) {
- ConsolFun function = getConsolidationFunction(db);
- long now = System.currentTimeMillis() / 1000;
- if (function != ConsolFun.AVERAGE) {
- try {
- // we store the last value again, so that the value change
- // in the database is not interpolated, but
- // happens right at this spot
- if (now - 1 > db.getLastUpdateTime()) {
- // only do it if there is not already a value
- double lastValue = db.getLastDatasourceValue(DATASOURCE_STATE);
- if (!Double.isNaN(lastValue)) {
- Sample sample = db.createSample();
- sample.setTime(now - 1);
- sample.setValue(DATASOURCE_STATE, lastValue);
- sample.update();
- logger.debug("Stored '{}' as value '{}' in rrd4j database (again)", name, lastValue);
- }
+ if (db == null) {
+ return;
+ }
+
+ ConsolFun function = getConsolidationFunction(db);
+ long now = System.currentTimeMillis() / 1000;
+ if (function != ConsolFun.AVERAGE) {
+ try {
+ // we store the last value again, so that the value change
+ // in the database is not interpolated, but
+ // happens right at this spot
+ if (now - 1 > db.getLastUpdateTime()) {
+ // only do it if there is not already a value
+ double lastValue = db.getLastDatasourceValue(DATASOURCE_STATE);
+ if (!Double.isNaN(lastValue)) {
+ Sample sample = db.createSample();
+ sample.setTime(now - 1);
+ sample.setValue(DATASOURCE_STATE, lastValue);
+ sample.update();
+ logger.debug("Stored '{}' as value '{}' in rrd4j database (again)", name, lastValue);
}
- } catch (IOException e) {
- logger.debug("Error storing last value (again): {}", e.getMessage());
}
+ } catch (IOException e) {
+ logger.debug("Error storing last value (again): {}", e.getMessage());
}
- try {
- Sample sample = db.createSample();
- sample.setTime(now);
-
- Double value = null;
-
- if (item instanceof NumberItem && item.getState() instanceof QuantityType) {
- NumberItem nItem = (NumberItem) item;
- QuantityType<?> qState = (QuantityType<?>) item.getState();
- Unit<? extends Quantity<?>> unit = nItem.getUnit();
- if (unit != null) {
- QuantityType<?> convertedState = qState.toUnit(unit);
- if (convertedState != null) {
- value = convertedState.doubleValue();
- } else {
- logger.warn(
- "Failed to convert state '{}' to unit '{}'. Please check your item definition for correctness.",
- qState, unit);
- }
+ }
+ try {
+ Sample sample = db.createSample();
+ sample.setTime(now);
+
+ Double value = null;
+
+ if (item instanceof NumberItem && item.getState() instanceof QuantityType) {
+ NumberItem nItem = (NumberItem) item;
+ QuantityType<?> qState = (QuantityType<?>) item.getState();
+ Unit<? extends Quantity<?>> unit = nItem.getUnit();
+ if (unit != null) {
+ QuantityType<?> convertedState = qState.toUnit(unit);
+ if (convertedState != null) {
+ value = convertedState.doubleValue();
} else {
- value = qState.doubleValue();
+ logger.warn(
+ "Failed to convert state '{}' to unit '{}'. Please check your item definition for correctness.",
+ qState, unit);
}
} else {
- DecimalType state = item.getStateAs(DecimalType.class);
- if (state != null) {
- value = state.toBigDecimal().doubleValue();
- }
+ value = qState.doubleValue();
}
- if (value != null) {
- if (db.getDatasource(DATASOURCE_STATE).getType() == DsType.COUNTER) { // counter values must be
- // adjusted by stepsize
- value = value * db.getRrdDef().getStep();
- }
- sample.setValue(DATASOURCE_STATE, value);
- sample.update();
- logger.debug("Stored '{}' as value '{}' in rrd4j database", name, value);
+ } else {
+ DecimalType state = item.getStateAs(DecimalType.class);
+ if (state != null) {
+ value = state.toBigDecimal().doubleValue();
}
- } catch (IllegalArgumentException e) {
- String message = e.getMessage();
- if (message != null && message.contains("at least one second step is required")) {
- // we try to store the value one second later
- ScheduledFuture<?> job = scheduledJobs.get(name);
- if (job != null) {
- job.cancel(true);
- scheduledJobs.remove(name);
- }
- job = scheduler.schedule(() -> store(item, name), 1, TimeUnit.SECONDS);
- scheduledJobs.put(name, job);
- } else {
- logger.warn("Could not persist '{}' to rrd4j database: {}", name, e.getMessage());
+ }
+ if (value != null) {
+ if (db.getDatasource(DATASOURCE_STATE).getType() == DsType.COUNTER) { // counter values must be
+ // adjusted by stepsize
+ value = value * db.getRrdDef().getStep();
}
- } catch (Exception e) {
- logger.warn("Could not persist '{}' to rrd4j database: {}", name, e.getMessage());
+ sample.setValue(DATASOURCE_STATE, value);
+ sample.update();
+ logger.debug("Stored '{}' as value '{}' in rrd4j database", name, value);
}
- try {
- db.close();
- } catch (IOException e) {
- logger.debug("Error closing rrd4j database: {}", e.getMessage());
+ } catch (IllegalArgumentException e) {
+ String message = e.getMessage();
+ if (message != null && message.contains("at least one second step is required")) {
+ // we try to store the value one second later
+ ScheduledFuture<?> job = scheduledJobs.get(name);
+ if (job != null) {
+ job.cancel(true);
+ scheduledJobs.remove(name);
+ }
+ job = scheduler.schedule(() -> store(item, name), 1, TimeUnit.SECONDS);
+ scheduledJobs.put(name, job);
+ } else {
+ logger.warn("Could not persist '{}' to rrd4j database: {}", name, e.getMessage());
}
+ } catch (Exception e) {
+ logger.warn("Could not persist '{}' to rrd4j database: {}", name, e.getMessage());
+ }
+ try {
+ db.close();
+ } catch (IOException e) {
+ logger.debug("Error closing rrd4j database: {}", e.getMessage());
}
}
} catch (IOException e) {
logger.warn("Could not query rrd4j database for item '{}': {}", itemName, e.getMessage());
return List.of();
+ } finally {
+ try {
+ db.close();
+ } catch (IOException e) {
+ logger.debug("Error closing rrd4j database: {}", e.getMessage());
+ }
}
}
protected synchronized @Nullable RrdDb getDB(String alias) {
RrdDb db = null;
- File file = new File(DB_FOLDER + File.separator + alias + ".rrd");
+ Path path = getDatabasePath(alias);
try {
- if (file.exists()) {
+ Builder builder = RrdDb.getBuilder();
+ builder.setPool(DATABASE_POOL);
+
+ if (Files.exists(path)) {
// recreate the RrdDb instance from the file
- db = RrdDb.of(file.getAbsolutePath());
+ builder.setPath(path.toString());
+ db = builder.build();
} else {
- File folder = new File(DB_FOLDER);
- if (!folder.exists()) {
- folder.mkdirs();
+ if (!Files.exists(DB_FOLDER)) {
+ Files.createDirectories(DB_FOLDER);
}
- RrdDef rrdDef = getRrdDef(alias, file);
+ RrdDef rrdDef = getRrdDef(alias, path);
if (rrdDef != null) {
// create a new database file
- db = RrdDb.of(rrdDef);
+ builder.setRrdDef(rrdDef);
+ db = builder.build();
} else {
logger.debug(
"Did not create rrd4j database for item '{}' since no rrd definition could be determined. This is likely due to an unsupported item type.",
}
}
} catch (IOException e) {
- logger.error("Could not create rrd4j database file '{}': {}", file.getAbsolutePath(), e.getMessage());
+ logger.error("Could not create rrd4j database file '{}': {}", path, e.getMessage());
} catch (RejectedExecutionException e) {
// this happens if the system is shut down
- logger.debug("Could not create rrd4j database file '{}': {}", file.getAbsolutePath(), e.getMessage());
+ logger.debug("Could not create rrd4j database file '{}': {}", path, e.getMessage());
}
return db;
}
return useRdc;
}
- private @Nullable RrdDef getRrdDef(String itemName, File file) {
- RrdDef rrdDef = new RrdDef(file.getAbsolutePath());
+ private @Nullable RrdDef getRrdDef(String itemName, Path path) {
+ RrdDef rrdDef = new RrdDef(path.toString());
RrdDefConfig useRdc = getRrdDefConfig(itemName);
if (useRdc != null) {
rrdDef.setStep(useRdc.step);
} else if (item instanceof NumberItem) {
if (unit != null) {
return new QuantityType(value, unit);
- } else {
- return new DecimalType(value);
}
}
return new DecimalType(value);
return SUPPORTED_TYPES.contains(ItemUtil.getMainItemType(item.getType()));
}
- private static String getUserPersistenceDataFolder() {
- return OpenHAB.getUserDataFolder() + File.separator + "persistence";
- }
-
@Activate
protected void activate(final Map<String, Object> config) {
modified(config);
while (keys.hasNext()) {
String key = keys.next();
- if (key.equals("service.pid") || key.equals("component.name")) {
+ if ("service.pid".equals(key) || "component.name".equals(key)) {
// ignore service.pid and name
continue;
}
}
try {
- if (property.equals("def")) {
+ if ("def".equals(property)) {
rrdDef.setDef(value);
- } else if (property.equals("archives")) {
+ } else if ("archives".equals(property)) {
rrdDef.addArchives(value);
- } else if (property.equals("items")) {
+ } else if ("items".equals(property)) {
rrdDef.addItems(value);
} else {
logger.debug("Unknown property {} : {}", property, value);
}
}
- private class RrdArchiveDef {
+ private static class RrdArchiveDef {
public @Nullable ConsolFun fcn;
public double xff;
public int steps, rows;
return;
}
- if (opts[0].equals("ABSOLUTE")) { // dsType
+ if ("ABSOLUTE".equals(opts[0])) { // dsType
dsType = DsType.ABSOLUTE;
- } else if (opts[0].equals("COUNTER")) {
+ } else if ("COUNTER".equals(opts[0])) {
dsType = DsType.COUNTER;
- } else if (opts[0].equals("DERIVE")) {
+ } else if ("DERIVE".equals(opts[0])) {
dsType = DsType.DERIVE;
- } else if (opts[0].equals("GAUGE")) {
+ } else if ("GAUGE".equals(opts[0])) {
dsType = DsType.GAUGE;
} else {
logger.warn("{}: dsType {} not supported", name, opts[0]);
heartbeat = Integer.parseInt(opts[1]);
- if (opts[2].equals("U")) {
+ if ("U".equals(opts[2])) {
min = Double.NaN;
} else {
min = Double.parseDouble(opts[2]);
}
- if (opts[3].equals("U")) {
+ if ("U".equals(opts[3])) {
max = Double.NaN;
} else {
max = Double.parseDouble(opts[3]);
}
RrdArchiveDef arc = new RrdArchiveDef();
- if (opts[0].equals("AVERAGE")) {
+ if ("AVERAGE".equals(opts[0])) {
arc.fcn = ConsolFun.AVERAGE;
- } else if (opts[0].equals("MIN")) {
+ } else if ("MIN".equals(opts[0])) {
arc.fcn = ConsolFun.MIN;
- } else if (opts[0].equals("MAX")) {
+ } else if ("MAX".equals(opts[0])) {
arc.fcn = ConsolFun.MAX;
- } else if (opts[0].equals("LAST")) {
+ } else if ("LAST".equals(opts[0])) {
arc.fcn = ConsolFun.LAST;
- } else if (opts[0].equals("FIRST")) {
+ } else if ("FIRST".equals(opts[0])) {
arc.fcn = ConsolFun.FIRST;
- } else if (opts[0].equals("TOTAL")) {
+ } else if ("TOTAL".equals(opts[0])) {
arc.fcn = ConsolFun.TOTAL;
} else {
logger.warn("{}: consolidation function {} not supported", name, opts[0]);
}
public void addItems(String itemsString) {
- String splitItems[] = itemsString.split(",");
- for (String item : splitItems) {
- itemNames.add(item);
- }
+ Collections.addAll(itemNames, itemsString.split(","));
}
public boolean appliesTo(String item) {
projects / openhab-addons.git / commitdiff