Merge pull request #16 from sve2-2020ss/documentation

Documentation
agentS · Apr 29, 2020 · 85d6706 · 85d6706
2 parents dc67950 + e52f835
commit 85d6706
Show file tree

Hide file tree

Showing 29 changed files with 2,432 additions and 252 deletions.
diff --git a/README.md b/README.md
diff --git a/_docker/runCollectors.bash b/_docker/runCollectors.bash
diff --git a/_docker/runCommandsScalingTest.bash b/_docker/runCommandsScalingTest.bash
@@ -0,0 +1,20 @@
+# Collector services
+java -Dquarkus.http.port=8085 -Dmp.messaging.incoming.mqtt-sensor-data.port=1883 -Dmp.messaging.incoming.mqtt-sensor-data.client-id=eu.collector.mqtt -Dmp.messaging.outgoing.amqp-measurement-records.containerId=eu.collector -jar collector.jar
+java -Dquarkus.http.port=8086 -Dmp.messaging.incoming.mqtt-sensor-data.port=1884 -Dmp.messaging.incoming.mqtt-sensor-data.client-id=us.collector.mqtt -Dmp.messaging.outgoing.amqp-measurement-records.containerId=us.collector -jar collector.jar
+java -Dquarkus.http.port=8087 -Dmp.messaging.incoming.mqtt-sensor-data.port=1885 -Dmp.messaging.incoming.mqtt-sensor-data.client-id=ca.collector.mqtt -Dmp.messaging.outgoing.amqp-measurement-records.containerId=ca.collector -jar collector.jar
+
+# Web frontend services
+java -Dquarkus.http.port=8080 -Dmp.messaging.incoming.measurement-records.containerId=frontend.charlie -jar frontend.jar
+java -Dquarkus.http.port=8081 -Dmp.messaging.incoming.measurement-records.containerId=frontend.delta -jar frontend.jar
+
+# Persistence services
+java -jar persist.jar
+java -jar persist.jar
+
+# Dashboard
+bokeh serve --show main.py
+
+# Weather station simulators
+java -jar stationSimulator-0.jar 0 127.0.0.1 1883
+java -jar stationSimulator-0.jar 3 127.0.0.1 1884
+java -jar stationSimulator-0.jar 6 127.0.0.1 1885
diff --git a/dashboard/amqp/WeatherRecordReceiver.py b/dashboard/amqp/WeatherRecordReceiver.py
@@ -33,7 +33,7 @@ def on_start(self, event):
 		)
 
 	def on_message(self, event):
-		weather_record_dto = create_weather_record_dto_from_json(event.message.body.decode("utf-8"))
+		weather_record_dto = create_weather_record_dto_from_json(event.message.body)
 		self.received += 1
 		if weather_record_dto.weather_station_id == self.weather_station_id:
 			self.record_received_callback(weather_record_dto)
diff --git a/dashboard/main.py b/dashboard/main.py
@@ -28,7 +28,7 @@
 
 plot = figure(
 	title = "Dashboard for weather station #" + os.getenv('WEATHER_STATION_ID'),
-	plot_height = 500,
+	plot_width = 1280,
 	tools="xpan,xwheel_zoom,xbox_zoom,reset",
 	x_axis_type = 'datetime'
 )

diff --git a/doc/architecture.png b/doc/architecture.png
diff --git a/doc/architecture.svg b/doc/architecture.svg
diff --git a/doc/architecture.vsdx b/doc/architecture.vsdx
diff --git a/doc/archtectureSketch_20200424.jpg → doc/architectureSketch_20200424.jpg b/doc/archtectureSketch_20200424.jpg → doc/architectureSketch_20200424.jpg
diff --git a/doc/architecture.dia → doc/architecture_alpha.dia b/doc/architecture.dia → doc/architecture_alpha.dia
diff --git a/doc/architecture_alpha.png b/doc/architecture_alpha.png
diff --git a/doc/architecture_alpha.svg b/doc/architecture_alpha.svg
diff --git a/doc/mqtt.png b/doc/mqtt.png
diff --git a/doc/test/esp8266_weather_station/consumers.png b/doc/test/esp8266_weather_station/consumers.png
diff --git a/doc/test/esp8266_weather_station/dashboard.png b/doc/test/esp8266_weather_station/dashboard.png
diff --git a/doc/test/esp8266_weather_station/persistenceAcks.png b/doc/test/esp8266_weather_station/persistenceAcks.png
diff --git a/doc/test/esp8266_weather_station/producers.png b/doc/test/esp8266_weather_station/producers.png
diff --git a/doc/test/esp8266_weather_station/webFrontend.png b/doc/test/esp8266_weather_station/webFrontend.png
diff --git a/doc/test/upscaling/consumers.png b/doc/test/upscaling/consumers.png
diff --git a/doc/test/upscaling/dashboard.png b/doc/test/upscaling/dashboard.png
diff --git a/doc/test/upscaling/producers.png b/doc/test/upscaling/producers.png
diff --git a/doc/test/upscaling/webFrontend.png b/doc/test/upscaling/webFrontend.png
diff --git a/doc/weatherStation.jpg b/doc/weatherStation.jpg
diff --git a/frontend/src/test/java/io/weatherStation/ExampleResourceTest.java b/frontend/src/test/java/io/weatherStation/ExampleResourceTest.java
diff --git a/frontend/src/test/java/io/weatherStation/NativeExampleResourceIT.java b/frontend/src/test/java/io/weatherStation/NativeExampleResourceIT.java
diff --git a/persist/configuration.yaml b/persist/configuration.yaml
@@ -13,3 +13,4 @@ persistence:
       password: thunderstorm
       queueName: measurement-records-persistence
       containerId: persistence
+      maxBufferedMessages: 4096
diff --git a/persist/src/main/java/io/weatherstation/persist/amqp/AmqpConsumerVerticle.java b/persist/src/main/java/io/weatherstation/persist/amqp/AmqpConsumerVerticle.java
@@ -28,12 +28,14 @@ public void start(Future<Void> startFuture) throws Exception {
 				startFuture.fail(connectionResult.cause());
 			} else {
 				AmqpConnection amqpConnection = connectionResult.result();
-				var amqpConnectionOptions = new AmqpReceiverOptions()
+				var amqpReceiverOptions = new AmqpReceiverOptions()
 					.setAutoAcknowledgement(false)
-					.setDurable(true);
+					.setDurable(true)
+					.setQos("AT_LEAST_ONCE")
+					.setMaxBufferedMessages(this.config().getInteger("maxBufferedMessages"));
 				amqpConnection.createReceiver(
 					this.config().getString("queueName"),
-					amqpConnectionOptions,
+					amqpReceiverOptions,
 					receiverCreationResult -> {
 						if (receiverCreationResult.failed()) {
 							startFuture.fail(receiverCreationResult.cause());
@@ -52,7 +54,7 @@ public void start(Future<Void> startFuture) throws Exception {
 	}
 
 	private void handleWeatherRecordMessage(AmqpMessage amqpMessage) {
-		JsonObject body = amqpMessage.bodyAsJsonObject();
+		var body = new JsonObject(amqpMessage.bodyAsString());
 		this.eventBus.send(
 			EventBusAddresses.PERSISTENCE_POSTGRESQL,
 			body,
@@ -64,6 +66,7 @@ private void handleWeatherRecordMessage(AmqpMessage amqpMessage) {
 						response.cause().printStackTrace(System.err);
 					} else {
 						amqpMessage.accepted();
+						System.out.println("Duplicated record not inserted for " + body);
 					}
 				} else {
 					amqpMessage.accepted();

diff --git a/persist/src/test/java/io/weatherstation/persist/TestMainVerticle.java b/persist/src/test/java/io/weatherstation/persist/TestMainVerticle.java
diff --git a/stationSimulator/src/main/java/com/wetr/Main.java b/stationSimulator/src/main/java/com/wetr/Main.java
@@ -28,6 +28,7 @@ private static List<StationSimulator> createStationSimulators(final int weatherS
         List<StationSimulator> stationSimulators = new ArrayList<>();
         stationSimulators.add(createStationSimulator(weatherStationIdOffset));
         stationSimulators.add(createStationSimulator(weatherStationIdOffset));
+        stationSimulators.add(createStationSimulator(weatherStationIdOffset));
         return stationSimulators;
     }