Print UUID when connected to Websocket Server

Chi-EEE · Mar 15, 2024 · 50fdb9f · 50fdb9f
1 parent 441fd2c
commit 50fdb9f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/app/rpi/common/include/car/system/messaging/MessagingSystem.h b/app/rpi/common/include/car/system/messaging/MessagingSystem.h
@@ -37,7 +37,6 @@ namespace car::system::messaging
 
 		nod::signal<void(const std::string, const rapidjson::Value&)>& getCommandSignal() { return this->command_signal; }
 		nod::signal<void(const std::string)>& getMessageSignal() { return this->message_signal; }
-		nod::signal<void()>& getConnectSignal() { return this->on_connect_signal; }
 		nod::signal<void(const std::string)>& getDisconnectSignal() { return this->on_disconnect_signal; }
 
 		void onMessageCallback(const ix::WebSocketMessagePtr& msg) const;
@@ -49,7 +48,6 @@ namespace car::system::messaging
 
 		const bool isConnected() const { return this->connected; }
 
-		nod::signal<void()> on_connect_signal;
 		nod::signal<void(std::string)> on_disconnect_signal;
 
 		nod::signal<void(const std::string)> message_signal;

diff --git a/app/rpi/common/src/car/system/messaging/MessagingSystem.cpp b/app/rpi/common/src/car/system/messaging/MessagingSystem.cpp
@@ -90,12 +90,6 @@ namespace car::system::messaging
 	{
 		switch (msg->type)
 		{
-		case ix::WebSocketMessageType::Open:
-		{
-			spdlog::info("Connected to the Websocket Server.");
-			this->on_connect_signal();
-			break;
-		}
 		case ix::WebSocketMessageType::Close:
 		{
 			spdlog::info("Disconnected from the Websocket Server; Reason: {}", msg->closeInfo.reason);

diff --git a/app/rpi/daemon/src/main.cpp b/app/rpi/daemon/src/main.cpp
@@ -126,7 +126,7 @@ class rpi_daemon : public daemon
         }
         else
         {
-            dlog::info("Connected to the WS Server.");
+            dlog::notice(fmt::format(R"(Connected to the Websocket Server; UUID: "{}")", this->car_system->getMessagingSystem()->getUUID()));
         }
         this->last_connected = now;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -126,7 +126,7 @@ class rpi_daemon : public daemon @@
             }
             else
             {
-                dlog::info("Connected to the WS Server.");
+                dlog::notice(fmt::format(R"(Connected to the Websocket Server; UUID: "{}")", this->car_system->getMessagingSystem()->getUUID()));
             }
             this->last_connected = now;
         }
@@ Expand Down @@