Merge pull request #53 from Telecominfraproject/main

Updating release

Author: stephb9959

BUILDING.md

@@ -16,15 +16,15 @@ from the master copy needed for cmake. Please use the version of this [Poco fix]
 Poco may take several minutes depending on the platform you are building on.
 
 ## Ubuntu
-These instructions have proven to work on Ubuntu 20.4.
+These instructions have proven to work on Ubuntu 23.04.
 ```bash
-sudo apt install git cmake g++ libssl-dev libmariadb-dev 
+sudo apt install git cmake g++ libssl-dev libmariadb-dev libmariadbclient-dev-compat
 sudo apt install libpq-dev libaprutil1-dev apache2-dev libboost-all-dev
-sudo apt install librdkafka-dev default-libmysqlclient-dev
-sudo apt install nlohmann-json-dev
+sudo apt install librdkafka-dev
+sudo apt install zlib1g-dev nlohmann-json3-dev ca-certificates libcurl4-openssl-dev
 
 cd ~
-git clone https://github.com/AriliaWireless/poco --branch poco-tip-v1
+git clone https://github.com/AriliaWireless/poco --branch poco-tip-v2
 cd poco
 mkdir cmake-build
 cd cmake-build

CMakeLists.txt

@@ -63,7 +63,7 @@ include_directories(/usr/local/include  /usr/local/opt/openssl/include src inclu
 
 configure_file(src/ow_version.h.in ${PROJECT_SOURCE_DIR}/src/ow_version.h @ONLY)
 
-add_definitions(-DPOCO_LOG_DEBUG="1")
+add_definitions(-DPOCO_LOG_DEBUG="1" -DBOOST_NO_CXX98_FUNCTION_BASE=1)
 
 add_executable(owanalytics
         build

build

@@ -1 +1 @@
-2
+6

src/APStats.cpp

@@ -112,7 +112,7 @@ namespace OpenWifi {
 		DI_.connected = true;
 
 		AnalyticsObjects::DeviceTimePoint DTP;
-		poco_information(Logger(), fmt::format("{}: stats message.", DI_.serialNumber));
+		poco_trace(Logger(), fmt::format("{}: stats message.", DI_.serialNumber));
 
 		// find radios first to get associations.
 		try {
@@ -573,7 +573,7 @@ namespace OpenWifi {
 		try {
 			if (Connection->contains("ping")) {
 				got_connection = true;
-				poco_debug(Logger(), fmt::format("{}: ping message.", DI_.serialNumber));
+				poco_trace(Logger(), fmt::format("{}: ping message.", DI_.serialNumber));
 				DI_.connected = true;
 				DI_.lastPing = Utils::Now();
 				auto ping = (*Connection)["ping"];
@@ -589,13 +589,13 @@ namespace OpenWifi {
 					}
 				}
 			} else if (Connection->contains("disconnection")) {
-				poco_debug(Logger(), fmt::format("{}: disconnection message.", DI_.serialNumber));
+				poco_trace(Logger(), fmt::format("{}: disconnection message.", DI_.serialNumber));
 				auto Disconnection = (*Connection)["disconnection"];
 				GetJSON("timestamp", Disconnection, DI_.lastDisconnection, (uint64_t)0);
 				got_base = got_health = got_connection = false;
 				DI_.connected = false;
 			} else if (Connection->contains("capabilities")) {
-				poco_debug(Logger(), fmt::format("{}: connection message.", DI_.serialNumber));
+				poco_trace(Logger(), fmt::format("{}: connection message.", DI_.serialNumber));
 				got_connection = true;
 				DI_.connected = true;
 				DI_.lastConnection = Utils::Now();
@@ -621,7 +621,7 @@ namespace OpenWifi {
 			got_health = true;
 			GetJSON("timestamp", *Health, DI_.lastHealth, (uint64_t)0);
 			GetJSON("sanity", *Health, DI_.health, (uint64_t)0);
-			poco_debug(Logger(), fmt::format("{}: health message.", DI_.serialNumber));
+			poco_trace(Logger(), fmt::format("{}: health message.", DI_.serialNumber));
 		} catch (...) {
 			poco_information(Logger(),
 							 fmt::format("{}: error parsing health message.", DI_.serialNumber));

src/DeviceStatusReceiver.cpp

@@ -80,7 +80,7 @@ namespace OpenWifi {
 	void DeviceStatusReceiver::DeviceStatusReceived(const std::string &Key,
 													const std::string &Payload) {
 		std::lock_guard G(Mutex_);
-		poco_debug(Logger(), fmt::format("Device({}): Connection/Ping message.", Key));
+		poco_trace(Logger(), fmt::format("Device({}): Connection/Ping message.", Key));
 		Queue_.enqueueNotification(new DeviceStatusMessage(Key, Payload));
 	}
 } // namespace OpenWifi

src/HealthReceiver.cpp

@@ -78,7 +78,7 @@ namespace OpenWifi {
 
 	void HealthReceiver::HealthReceived(const std::string &Key, const std::string &Payload) {
 		std::lock_guard G(Mutex_);
-		poco_debug(Logger(), fmt::format("Device({}): Health message.", Key));
+		poco_trace(Logger(), fmt::format("Device({}): Health message.", Key));
 		Queue_.enqueueNotification(new HealthMessage(Key, Payload));
 	}
 } // namespace OpenWifi

src/StateReceiver.cpp

@@ -61,7 +61,7 @@ namespace OpenWifi {
 
 	void StateReceiver::StateReceived(const std::string &Key, const std::string &Payload) {
 		std::lock_guard G(Mutex_);
-		poco_debug(Logger(), fmt::format("Device({}): State message.", Key));
+		poco_trace(Logger(), fmt::format("Device({}): State message.", Key));
 		Queue_.enqueueNotification(new StateMessage(Key, Payload));
 	}
 

src/VenueCoordinator.cpp

@@ -60,7 +60,7 @@ namespace OpenWifi {
 		Utils::SetThreadName("venue-coord");
 		Running_ = true;
 		while (Running_) {
-			Poco::Thread::trySleep(20000);
+			Poco::Thread::trySleep(60000);
 			if (!Running_)
 				break;
 

src/framework/ALBserver.cpp

@@ -26,7 +26,7 @@ namespace OpenWifi {
 			Response.set("Connection", "keep-alive");
 			Response.setVersion(Poco::Net::HTTPMessage::HTTP_1_1);
 			std::ostream &Answer = Response.send();
-			Answer << "process Alive and kicking!";
+			Answer << ALBHealthCheckServer()->CallbackText();
 		} catch (...) {
 		}
 	}

src/framework/ALBserver.h

@@ -37,6 +37,8 @@ namespace OpenWifi {
 		inline static std::atomic_uint64_t req_id_ = 1;
 	};
 
+	typedef std::string ALBHealthMessageCallback();
+
 	class ALBHealthCheckServer : public SubSystemServer {
 	  public:
 		ALBHealthCheckServer();
@@ -48,10 +50,22 @@ namespace OpenWifi {
 
 		int Start() override;
 		void Stop() override;
+		inline void RegisterExtendedHealthMessage(ALBHealthMessageCallback *F) {
+			Callback_=F;
+		};
+
+		inline std::string CallbackText() {
+			if(Callback_== nullptr) {
+				return "process Alive and kicking!";
+			} else {
+				return Callback_();
+			}
+		}
 
 	  private:
 		std::unique_ptr<Poco::Net::HTTPServer> Server_;
 		std::unique_ptr<Poco::Net::ServerSocket> Socket_;
+		ALBHealthMessageCallback	*Callback_= nullptr;
 		int Port_ = 0;
 		mutable std::atomic_bool Running_ = false;
 	};