Merge branch 'master' into fix/prepared_statement

telefonicaid · Oct 15, 2020 · 17729c2 · 17729c2
2 parents 2f9140f + 2bed57d
commit 17729c2
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 7 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,4 +1,5 @@
 [cygnus-ngsi, cygnus-common][PosgtgreSQLSink, PostgisSink, MySQLSQLSink] Remove PreparedStatement building, to use String query (walkaround for #1959)
+[cygnus-ngsi, cygnus-common][PosgtgreSQLSink, PostgisSink, MySQLSQLSink] Log info about persisted data (#1939)
 [cygnus-ngsi, cygnus-common][PosgtgreSQLSink, PostgisSink, MySQLSQLSink] Create upsert transaction (#1806, #1936)
 [cygnus-common][NameMappingInterceptor] Catch and log Compile error namemapping (#1924)
 [cygnus-ngsi][PosgtgreSQLSink, PostgisSink] Add upsert function. (#1806)

diff --git a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/sql/SQLBackendImpl.java b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/sql/SQLBackendImpl.java
@@ -241,6 +241,7 @@ public void insertContextData(String destination, String tableName, String field
         try {
             LOGGER.debug(sqlInstance.toUpperCase() + " Executing SQL query '" + query + "'");
             stmt.executeUpdate(query);
+            LOGGER.info(sqlInstance.toUpperCase() + " Executed SQL query '" + query + "'");
         } catch (SQLTimeoutException e) {
             throw new CygnusPersistenceError(sqlInstance.toUpperCase() + " Data insertion error. Query insert into `" + tableName + "` " + fieldNames + " values " + fieldValues, "SQLTimeoutException", e.getMessage());
         } catch (SQLException e) {

diff --git a/cygnus-ngsi-ld/src/main/assembly/assemblyCompile.xml b/cygnus-ngsi-ld/src/main/assembly/assemblyCompile.xml
@@ -0,0 +1,23 @@
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+	<id>jar-with-all-dependencies</id>
+	<formats>
+		<format>jar</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<dependencySets>
+		<dependencySet>
+			<outputDirectory>/</outputDirectory>
+			<useProjectArtifact>true</useProjectArtifact>
+			<unpack>true</unpack>
+			<scope>runtime</scope>
+		</dependencySet>
+		<dependencySet>
+			<outputDirectory>/</outputDirectory>
+			<unpack>true</unpack>
+			<scope>system</scope>
+		</dependencySet>
+	</dependencySets>
+</assembly>
diff --git a/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIMySQLSink.java b/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIMySQLSink.java
@@ -415,7 +415,7 @@ private void persistAggregation(NGSIGenericAggregator aggregator)
         String dbName = aggregator.getDbName(enableLowercase);
         String tableName = aggregator.getTableName(enableLowercase);
 
-        LOGGER.info("[" + this.getName() + "] Persisting data at NGSIMySQLSink. Database ("
+        LOGGER.debug("[" + this.getName() + "] Persisting data at NGSIMySQLSink. Database ("
                 + dbName + "), Table (" + tableName + "), Fields (" + fieldsForInsert + "), Values ("
                 + valuesForInsert + ")");
 

diff --git a/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIPostgisSink.java b/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIPostgisSink.java
@@ -438,7 +438,7 @@ private void persistAggregation(NGSIGenericAggregator aggregator) throws CygnusP
             createPersistenceBackend(postgisHost, postgisPort, postgisUsername, postgisPassword, maxPoolSize, aggregator.getDbName(enableLowercase), postgisOptions, persistErrors, maxLatestErrors);
         }
 
-        LOGGER.info("[" + this.getName() + "] Persisting data at NGSIPostgisSink. Schema ("
+        LOGGER.debug("[" + this.getName() + "] Persisting data at NGSIPostgisSink. Schema ("
                 + schemaName + "), Table (" + tableName + "), Fields (" + fieldsForInsert + "), Values ("
                 + valuesForInsert + ")");
 

diff --git a/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIPostgreSQLSink.java b/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIPostgreSQLSink.java
@@ -425,7 +425,7 @@ private void persistAggregation(NGSIGenericAggregator aggregator) throws CygnusP
             createPersistenceBackend(postgresqlHost, postgresqlPort, postgresqlUsername, postgresqlPassword, maxPoolSize, aggregator.getDbName(enableLowercase), postgresqlOptions, persistErrors, maxLatestErrors);
         }
 
-        LOGGER.info("[" + this.getName() + "] Persisting data at NGSIPostgreSQLSink. Schema ("
+        LOGGER.debug("[" + this.getName() + "] Persisting data at NGSIPostgreSQLSink. Schema ("
                 + schemaName + "), Table (" + tableName + "), Fields (" + fieldsForInsert + "), Values ("
                 + valuesForInsert + ")");
 

diff --git a/docker/cygnus-ngsi-ld/Dockerfile b/docker/cygnus-ngsi-ld/Dockerfile
@@ -307,11 +307,10 @@ RUN \
     ${MVN_HOME}/bin/mvn ${MAVEN_ARGS} clean compile exec:exec assembly:single && \
     cp target/cygnus-common-${CYGNUS_VERSION}-jar-with-dependencies.jar ${FLUME_HOME}/plugins.d/cygnus/libext/ && \
     ${MVN_HOME}/bin/mvn install:install-file -Dfile=${FLUME_HOME}/plugins.d/cygnus/libext/cygnus-common-${CYGNUS_VERSION}-jar-with-dependencies.jar -DgroupId=com.telefonica.iot -DartifactId=cygnus-common -Dversion=${CYGNUS_VERSION} -Dpackaging=jar -DgeneratePom=false && \
-    echo "INFO: Build and install cygnus-ngsi" && \
+    echo "INFO: Build and install cygnus-ngsi-ld" && \
     cd ${CYGNUS_HOME}/cygnus-ngsi-ld && \
     ${MVN_HOME}/bin/mvn ${MAVEN_ARGS} clean compile exec:exec assembly:single && \
     cp target/cygnus-ngsi-ld-${CYGNUS_VERSION}-jar-with-dependencies.jar ${FLUME_HOME}/plugins.d/cygnus/lib/ && \
-    cp ${CYGNUS_HOME}/cygnus-ngsi-ld/src/main/resources/ArcgisUtils-0.0.1-SNAPSHOT.jar ${FLUME_HOME}/plugins.d/cygnus/lib/ && \
     echo "INFO: Install Cygnus Application script" && \
     cp ${CYGNUS_HOME}/cygnus-common/target/classes/cygnus-flume-ng ${FLUME_HOME}/bin/ && \
     chmod +x ${FLUME_HOME}/bin/cygnus-flume-ng && \

diff --git a/docker/cygnus-ngsi-ld/docker-compose.yml b/docker/cygnus-ngsi-ld/docker-compose.yml
@@ -40,7 +40,7 @@ services:
   cygnus-ld:
     hostname: cygnus-ld
     container_name: cygnus-ld
-    image: ging/fiware-cygnus
+    image: fiware/cygnus-ngsi-ld
     environment:
       CYGNUS_POSTGRESQL_HOST: postgres-db
       CYGNUS_POSTGRESQL_PASS: example
@@ -50,4 +50,4 @@ services:
       - "5050:5050"
 
 volumes:
-  mongo-db: ~
+  mongo-db: ~