Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[rrd4j] Error handling for broken rrd4j files #13955

Merged
merged 2 commits into from
Dec 15, 2022
Merged

[rrd4j] Error handling for broken rrd4j files #13955

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
688c7a8
[rrd4j] Error handling for broken rrd4j files
holgerfriedrich Dec 15, 2022
2a3f958
review comments
holgerfriedrich Dec 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions ...e.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,12 @@ public synchronized void store(final Item item, @Nullable final String alias) {
}
final String name = alias == null ? item.getName() : alias;

RrdDb db = getDB(name);
RrdDb db = null;
try {
db = getDB(name);
} catch (Exception e) {
logger.warn("Failed to open rrd4j database '{}' ({})", name, e.getClass().getName());
holgerfriedrich marked this conversation as resolved.
Show resolved Hide resolved
}
if (db == null) {
return;
}
Expand Down Expand Up @@ -249,7 +254,13 @@ public void store(Item item) {
public Iterable<HistoricItem> query(FilterCriteria filter) {
String itemName = filter.getItemName();

RrdDb db = getDB(itemName);
RrdDb db = null;
try {
db = getDB(itemName);
} catch (Exception e) {
logger.warn("Failed to open rrd4j database '{}' ({})", itemName, e.getClass().getName());
holgerfriedrich marked this conversation as resolved.
Show resolved Hide resolved
return List.of();
}
if (db == null) {
logger.debug("Could not find item '{}' in rrd4j database", itemName);
return List.of();
Expand Down