public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix s3 thing status (#14925) 

Signed-off-by: Alexandr Salamatov <goopilot@gmail.com>
This commit is contained in:
goopilot 2023-05-03 01:10:46 -05:00 committed by GitHub
parent 3130a67d8d
commit dc5d76d762
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/api/S3Actions.java
View File

@ -115,7 +115,7 @@ public class S3Actions {
List<String> returnList = new ArrayList<>(); List<String> returnList = new ArrayList<>();
if (nameNodesList.getLength() == 0) { if (nameNodesList.getLength() == 0) {
throw new Exception("No files deceted in the bucket"); return returnList;
} }
for (int i = 0; i < nameNodesList.getLength(); i++) { for (int i = 0; i < nameNodesList.getLength(); i++) {

2
bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/handler/S3BucketWatcherHandler.java
View File

@ -89,7 +89,6 @@ public class S3BucketWatcherHandler extends BaseThingHandler {
if (refreshS3BucketInformation()) { if (refreshS3BucketInformation()) {
if (config.pollIntervalS3 > 0) { if (config.pollIntervalS3 > 0) {
updateStatus(ThingStatus.ONLINE);
executionJob = scheduler.scheduleWithFixedDelay(this::refreshS3BucketInformation, config.pollIntervalS3, executionJob = scheduler.scheduleWithFixedDelay(this::refreshS3BucketInformation, config.pollIntervalS3,
config.pollIntervalS3, TimeUnit.SECONDS); config.pollIntervalS3, TimeUnit.SECONDS);
} else { } else {
@ -104,6 +103,7 @@ public class S3BucketWatcherHandler extends BaseThingHandler {
List<String> currentS3Listing = new ArrayList<>(); List<String> currentS3Listing = new ArrayList<>();
try { try {
currentS3Listing = s3.listBucket(config.s3Path); currentS3Listing = s3.listBucket(config.s3Path);
updateStatus(ThingStatus.ONLINE);
List<String> difS3Listing = new ArrayList<>(currentS3Listing); List<String> difS3Listing = new ArrayList<>(currentS3Listing);
difS3Listing.removeAll(previousS3Listing); difS3Listing.removeAll(previousS3Listing);
difS3Listing.forEach(file -> triggerChannel(CHANNEL_NEWFILE, file)); difS3Listing.forEach(file -> triggerChannel(CHANNEL_NEWFILE, file));