Merge branch 'release/3.1.1'

SolarNetwork · Jan 12, 2024 · a9f77dd · a9f77dd
2 parents aba39aa + 47ea728
commit a9f77dd
Show file tree

Hide file tree

Showing 26 changed files with 87 additions and 39 deletions.
diff --git a/solarnet/build.gradle b/solarnet/build.gradle
@@ -68,7 +68,7 @@ subprojects {
 		jsonSchemaValidatorVersion = '1.0.73'
 		myBatisStarterVersion = '3.0.3'
 		snCommonVersion = '3.5.2'
-		snCommonMqttVersion = '4.0.0'
+		snCommonMqttVersion = '4.0.1'
 		snCommonMqttNettyVersion = '3.0.1'
 		snCommonOcppVersion = '2.7.0'
 		snCommonOcpp16Version = '2.1.7'

diff --git a/solarnet/common-test/build.gradle b/solarnet/common-test/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0' apply false
+	id 'org.springframework.boot' version '3.2.1' apply false
 }
 
 apply plugin: 'java-library'

diff --git a/solarnet/common/build.gradle b/solarnet/common/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0' apply false
+	id 'org.springframework.boot' version '3.2.1' apply false
 }
 
 apply plugin: 'java-library'

diff --git a/solarnet/datum/build.gradle b/solarnet/datum/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0' apply false
+	id 'org.springframework.boot' version '3.2.1' apply false
 }
 
 apply plugin: 'java-library'
@@ -14,7 +14,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: Datum'
-version = '2.1.0'
+version = '2.2.0'
 
 base {
 	archivesName = 'solarnet-datum'

diff --git a/...rnet/datum/src/main/java/net/solarnetwork/central/datum/flux/SolarFluxDatumPublisher.java b/...rnet/datum/src/main/java/net/solarnetwork/central/datum/flux/SolarFluxDatumPublisher.java
@@ -44,7 +44,7 @@
  * Publish datum to SolarFlux.
  * 
  * @author matt
- * @version 2.1
+ * @version 2.2
  */
 public class SolarFluxDatumPublisher extends MqttJsonPublisher<Identity<GeneralNodeDatumPK>>
 		implements DatumProcessor {
@@ -65,7 +65,13 @@ public class SolarFluxDatumPublisher extends MqttJsonPublisher<Identity<GeneralN
 	 */
 	public static final String NODE_AGGREGATE_DATUM_TOPIC_TEMPLATE = "user/%d/node/%d/datum/%s/%s";
 
+	/** The {@code errorLogLimitMs} property default value. */
+	public static final long ERROR_LOG_LIMIT_MS_DEFAULT = 60_000L;
+
 	private final SolarNodeOwnershipDao supportDao;
+	private long errorLogLimitMs = ERROR_LOG_LIMIT_MS_DEFAULT;
+
+	private long lastErrorTime = 0; // ignoring thread safety for performance
 
 	/**
 	 * Constructor.
@@ -141,18 +147,34 @@ public boolean processDatumCollection(Iterable<? extends Identity<GeneralNodeDat
 			while ( root.getCause() != null ) {
 				root = root.getCause();
 			}
-			if ( (root instanceof RemoteServiceException)
-					|| (root instanceof net.solarnetwork.service.RemoteServiceException) ) {
-				log.error("Error publishing {} datum to SolarFlux: {}", aggDisplayName(aggregation),
-						root.getMessage());
+			if ( errorLogLimitMs > 0 ) {
+				final long now = System.currentTimeMillis();
+				final long tdiff = errorLogLimitMs > 0 ? now - lastErrorTime : lastErrorTime;
+				if ( tdiff >= lastErrorTime ) {
+					logPublishError(e, root, aggregation);
+					lastErrorTime = now;
+				} else {
+					log.debug("Problem publishing {} datum to SolarFlux: {}",
+							aggDisplayName(aggregation), root.getMessage());
+				}
 			} else {
-				log.error("Error publishing {} datum to SolarFlux: {}", aggDisplayName(aggregation),
-						root.toString(), e);
+				logPublishError(e, root, aggregation);
 			}
 		}
 		return false;
 	}
 
+	private void logPublishError(Throwable e, Throwable root, Aggregation aggregation) {
+		if ( (root instanceof RemoteServiceException)
+				|| (root instanceof net.solarnetwork.service.RemoteServiceException) ) {
+			log.warn("Problem publishing {} datum to SolarFlux: {}", aggDisplayName(aggregation),
+					root.getMessage());
+		} else {
+			log.error("Problem publishing {} datum to SolarFlux: {}", aggDisplayName(aggregation),
+					root.toString(), e);
+		}
+	}
+
 	private static String aggDisplayName(Aggregation aggregation) {
 		return aggregation == Aggregation.None ? "Raw" : aggregation.toString();
 	}
@@ -194,4 +216,25 @@ private String topicForDatum(Aggregation aggregation, Identity<GeneralNodeDatumP
 		return String.format(NODE_AGGREGATE_DATUM_TOPIC_TEMPLATE, ownership.getUserId(), nodeId,
 				aggregation.getKey(), sourceId);
 	}
+
+	/**
+	 * Get the error log limit.
+	 * 
+	 * @return the milliseconds to limit error log message to, or 0 for no
+	 *         limit; defaults to {@link #ERROR_LOG_LIMIT_MS_DEFAULT}
+	 */
+	public long getErrorLogLimitMs() {
+		return errorLogLimitMs;
+	}
+
+	/**
+	 * Set the error log limit.
+	 * 
+	 * @param errorLogLimitMs
+	 *        the milliseconds to limit error log message to, or 0 for no limit
+	 */
+	public void setErrorLogLimitMs(long errorLogLimitMs) {
+		this.errorLogLimitMs = errorLogLimitMs;
+	}
+
 }
diff --git a/solarnet/dnp3/build.gradle b/solarnet/dnp3/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0' apply false
+	id 'org.springframework.boot' version '3.2.1' apply false
 }
 
 apply plugin: 'java-library'

diff --git a/solarnet/instructor/build.gradle b/solarnet/instructor/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0' apply false
+	id 'org.springframework.boot' version '3.2.1' apply false
 }
 
 apply plugin: 'java-library'

diff --git a/solarnet/net-proxy/build.gradle b/solarnet/net-proxy/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0' apply false
+	id 'org.springframework.boot' version '3.2.1' apply false
 }
 
 apply plugin: 'java-library'

diff --git a/solarnet/ocpp/build.gradle b/solarnet/ocpp/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0' apply false
+	id 'org.springframework.boot' version '3.2.1' apply false
 }
 
 apply plugin: 'java-library'

diff --git a/solarnet/oscp-fp/build.gradle b/solarnet/oscp-fp/build.gradle
@@ -1,15 +1,15 @@
 plugins {
 	id 'java'
 	id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0'
+	id 'org.springframework.boot' version '3.2.1'
 }
 
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 description = 'SolarOSCP Flexibility Provider'
-version = '2.1.0'
+version = '2.1.1'
 
 base {
 	archivesName = 'solaroscp-fp'

diff --git a/solarnet/oscp-sim-cp/build.gradle b/solarnet/oscp-sim-cp/build.gradle
@@ -1,7 +1,7 @@
 plugins {
 	id 'java'
 	id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0'
+	id 'org.springframework.boot' version '3.2.1'
 }
 
 apply plugin: 'java'

diff --git a/solarnet/oscp/build.gradle b/solarnet/oscp/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0' apply false
+	id 'org.springframework.boot' version '3.2.1' apply false
 }
 
 apply plugin: 'java-library'

diff --git a/solarnet/solardnp3/build.gradle b/solarnet/solardnp3/build.gradle
@@ -1,15 +1,15 @@
 plugins {
 	id 'java'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0'
+	id 'org.springframework.boot' version '3.2.1'
 }
 
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 description = 'SolarDNP3'
-version = '2.1.0'
+version = '2.1.1'
 
 base {
 	archivesName = 'solardnp3'

diff --git a/solarnet/solarflux-vernemq-webhook/build.gradle b/solarnet/solarflux-vernemq-webhook/build.gradle
@@ -1,7 +1,7 @@
 plugins {
 	id 'java'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0'
+	id 'org.springframework.boot' version '3.2.1'
 }
 
 apply plugin: 'java'

diff --git a/solarnet/solarflux-vernemq-webhook/src/main/resources/application.yml b/solarnet/solarflux-vernemq-webhook/src/main/resources/application.yml
@@ -28,7 +28,6 @@ spring:
       validationInterval: 35000
       removeAbandoned: true
       removeAbandonedTimeout: 600
-      jdbcInterceptors: "ConnectionState;StatementCache(prepared=true,callable=false,max=50);ResetAbandonedTimer"
   jackson:
     default-property-inclusion: non_null
 
@@ -38,6 +37,7 @@ logging:
     file:  "%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:%5p} %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:%wEx}"
   level:
     net.solarnetwork: DEBUG
+    org.apache.tomcat: TRACE
 
 debugMode: true
 
@@ -48,6 +48,8 @@ spring:
     url: jdbc:postgresql://localhost:5412/solarnetwork
     username: solarauth
     password: solarauth
+    tomcat:
+      jdbcInterceptors: "ConnectionState;StatementCache(prepared=true,callable=false,max=50);ResetAbandonedTimer"
 
 debugMode: true
 
@@ -58,6 +60,9 @@ logging:
 ---
 spring:
   config.activate.on-profile: production
+  datasource:
+    tomcat:
+      jdbcInterceptors: "ConnectionState;StatementCache(prepared=true,callable=false,max=50);ResetAbandonedTimer"
 
 debugMode: false
 

diff --git a/solarnet/solarin/build.gradle b/solarnet/solarin/build.gradle
@@ -1,15 +1,15 @@
 plugins {
 	id 'java'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0'
+	id 'org.springframework.boot' version '3.2.1'
 }
 
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 description = 'SolarIn'
-version = '2.1.0'
+version = '2.1.1'
 
 base {
 	archivesName = 'solarin'

diff --git a/solarnet/solarjobs/build.gradle b/solarnet/solarjobs/build.gradle
@@ -1,15 +1,15 @@
 plugins {
 	id 'java'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0'
+	id 'org.springframework.boot' version '3.2.1'
 }
 
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 description = 'SolarJobs'
-version = '2.1.0'
+version = '2.1.1'
 
 base {
 	archivesName = 'solarjobs'

diff --git a/solarnet/solarocpp/build.gradle b/solarnet/solarocpp/build.gradle
@@ -1,15 +1,15 @@
 plugins {
 	id 'java'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0'
+	id 'org.springframework.boot' version '3.2.1'
 }
 
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 description = 'SolarOCPP'
-version = '2.1.0'
+version = '2.1.1'
 
 base {
 	archivesName = 'solarocpp'

diff --git a/solarnet/solarquery/build.gradle b/solarnet/solarquery/build.gradle
@@ -1,7 +1,7 @@
 plugins {
 	id 'java'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0'
+	id 'org.springframework.boot' version '3.2.1'
 }
 
 apply plugin: 'java'

diff --git a/solarnet/solaruser/build.gradle b/solarnet/solaruser/build.gradle
@@ -2,7 +2,7 @@ plugins {
 	//id 'checkstyle'
 	id 'java'
 	id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0'
+	id 'org.springframework.boot' version '3.2.1'
 }
 
 //apply plugin: 'checkstyle'
@@ -11,7 +11,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 description = 'SolarUser'
-version = '2.1.0'
+version = '2.1.1'
 
 base {
 	archivesName = 'solaruser'

diff --git a/solarnet/user-billing/build.gradle b/solarnet/user-billing/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0' apply false
+	id 'org.springframework.boot' version '3.2.1' apply false
 }
 
 apply plugin: 'java-library'

diff --git a/solarnet/user-datum/build.gradle b/solarnet/user-datum/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0' apply false
+	id 'org.springframework.boot' version '3.2.1' apply false
 }
 
 apply plugin: 'java-library'

diff --git a/solarnet/user-dnp3/build.gradle b/solarnet/user-dnp3/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0' apply false
+	id 'org.springframework.boot' version '3.2.1' apply false
 }
 
 apply plugin: 'java-library'

diff --git a/solarnet/user-ocpp/build.gradle b/solarnet/user-ocpp/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0' apply false
+	id 'org.springframework.boot' version '3.2.1' apply false
 }
 
 apply plugin: 'java-library'

diff --git a/solarnet/user-oscp/build.gradle b/solarnet/user-oscp/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'eclipse'
-	id 'org.springframework.boot' version '3.2.0' apply false
+	id 'org.springframework.boot' version '3.2.1' apply false
 }
 
 apply plugin: 'java-library'