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

check if featureTable is connected before use it (arcgis) #2421

Merged
merged 6 commits into from
Oct 1, 2024
Merged

check if featureTable is connected before use it (arcgis) #2421

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1162cee
log reuse persistenceBackend
AlvaroVega Sep 27, 2024
8058d6e
check if connected
AlvaroVega Sep 27, 2024
bf8fccf
Merge branch 'master' into task/log_reuse_persistenceBackend_arcgis
AlvaroVega Sep 27, 2024
da48cc7
update CNR
AlvaroVega Sep 27, 2024
5e71ef4
log in info creation/reuse feature table
AlvaroVega Sep 30, 2024
9461100
Update CHANGES_NEXT_RELEASE
AlvaroVega Oct 1, 2024
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
2 changes: 2 additions & 0 deletions CHANGES_NEXT_RELEASE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
- [cygnus-ngsi][arcgis] Check feature table is connected before use it
- [cygnus-ngsi][arcgis] Set feature table to not connected after a connection error
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#2405 should be mentioned here?


4 changes: 4 additions & 0 deletions ...src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/ArcgisFeatureTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import java.net.SocketException;

import com.telefonica.iot.cygnus.backends.arcgis.exceptions.ArcgisException;
import com.telefonica.iot.cygnus.backends.arcgis.model.Credential;
Expand Down Expand Up @@ -593,6 +594,9 @@ private void setError(Exception e) {
this.errorCode = agsEx.getCode();
} else {
if (e != null && e.getCause() != null) {
if (e.getCause() instanceof SocketException) {
connected = false;
}
LOGGER.error("Error Cause: " + e.getCause().getMessage());
}
LOGGER.error("Error Message: " + e.getMessage());
Expand Down
6 changes: 4 additions & 2 deletions cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIArcgisFeatureTableSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,12 @@ protected int featuresBatched() {
*/
protected ArcgisFeatureTable getPersistenceBackend(String featureServiceUrl) throws CygnusRuntimeError {

if (arcgisPersistenceBackend.containsKey(featureServiceUrl)) {
if (arcgisPersistenceBackend.containsKey(featureServiceUrl) &&
arcgisPersistenceBackend.get(featureServiceUrl).connected() ){
LOGGER.info("Using persistenceBackend which contains key for Feature table: " + featureServiceUrl);
return arcgisPersistenceBackend.get(featureServiceUrl);
} else {
LOGGER.debug("Creating new persistenceBackend for Feature table: " + featureServiceUrl);
LOGGER.info("Creating new persistenceBackend for Feature table: " + featureServiceUrl);
LOGGER.debug("Token url: " + getGetTokenUrl());
try {
NGSIArcgisFeatureTable newTable = new NGSIArcgisFeatureTable(featureServiceUrl, getUsername(),
Expand Down
Loading