scottk/wlan-cloud-ucentralgw
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-ucentralgw.git synced 2025-10-29 09:52:27 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Upgrade to debian bookworm, resolve compile issues, work around IOExceptions test

Browse Source 
Signed-off-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com>
This commit is contained in:
Carsten Schafer
2025-08-20 14:10:16 -04:00
parent f537e701a0
commit 6ae1eeb2ea
5 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@@ -1,4 +1,4 @@
ARG DEBIAN_VERSION=11.5-slim
ARG DEBIAN_VERSION=bookworm
ARG POCO_VERSION=poco-tip-v2
ARG CPPKAFKA_VERSION=tip-v1
ARG VALIJASON_VERSION=tip-v1.0.2
@@ -100,7 +100,7 @@ RUN mkdir -p $APP_ROOT $APP_CONFIG && \
RUN apt-get update && apt-get install --no-install-recommends -y \
librdkafka++1 gosu gettext ca-certificates bash jq curl wget \
libmariadb-dev-compat libpq5 unixodbc postgresql-client libfmt7 sqlite3
libmariadb-dev-compat libpq5 unixodbc postgresql-client libfmt9 sqlite3
COPY readiness_check /readiness_check
COPY test_scripts/curl/cli /cli

13
src/AP_WS_Connection.cpp
View File

@@ -627,8 +627,15 @@ namespace OpenWifi {
bool KillConnection=false;
try {
int Op, flags;
auto IncomingSize = WS_->receiveFrame(IncomingFrame, flags);
int Op, flags;
int IncomingSize;
//auto TS = Poco::Timespan(360, 0);
//if (WS_->poll(TS, 1)) {
IncomingSize = WS_->receiveFrame(IncomingFrame, flags);
//} else{
// return;
//}
Op = flags & Poco::Net::WebSocket::FRAME_OP_BITMASK;
@@ -775,7 +782,7 @@ namespace OpenWifi {
E.displayText(),
IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
State_.sessionId));
KillConnection=true;
//KillConnection=true;
} catch (const Poco::Exception &E) {
poco_warning(Logger_,
fmt::format("Exception({}): Text:{} Payload:{} Session:{}", CId_,

1
src/framework/MicroService.h
View File

@@ -14,6 +14,7 @@
#include <iostream>
#include <random>
#include <vector>
#include <optional>
// This must be defined for poco_debug and poco_trace macros to function.

1
src/framework/MicroServiceFuncs.h
View File

@@ -5,6 +5,7 @@
#pragma once
#include <string>
#include <optional>
#include "framework/OpenWifiTypes.h"

19
src/storage/storage_device.cpp
View File

@@ -202,15 +202,14 @@ namespace OpenWifi {
std::string st;
std::string whereClause = "";
if(!platform.empty()) {
if (!platform.empty()) {
if (includeProvisioned == false) {
whereClause = fmt::format("WHERE entity='' and venue='' and DeviceType='" + platform + "'");
//whereClause = fmt::format("WHERE entity='' and venue='' and DeviceType='" + platform + "'");
whereClause = fmt::format("WHERE entity='' and venue='' and DeviceType='{}'", platform);
} else {
whereClause = fmt::format("WHERE DeviceType='" + platform + "'");
//whereClause = fmt::format("WHERE DeviceType='" + platform + "'");
whereClause = fmt::format("WHERE DeviceType='{}'", platform);
}
//st = "SELECT SerialNumber From Devices WHERE DeviceType='" + platform + "' ";
} else {
if (includeProvisioned == false) {
@@ -218,7 +217,7 @@ namespace OpenWifi {
}
//st = "SELECT SerialNumber From Devices ";
}
st = fmt::format("SELECT SerialNumber From Devices {}", whereClause);
if (orderBy.empty())
@@ -896,9 +895,9 @@ namespace OpenWifi {
if (includeProvisioned == false) {
whereClause = fmt::format("WHERE DeviceType='{}' and entity='' and venue=''",platform);
} else {
whereClause = fmt::format("WHERE DeviceType='{}'", platform);
whereClause = fmt::format("WHERE DeviceType='{}'", platform);
}
}
st =
@@ -907,7 +906,7 @@ namespace OpenWifi {
ComputeRange(From, HowMany));
//Logger().information(fmt::format(" GetDevices st is {} ", st));
Select << ConvertParams(st), Poco::Data::Keywords::into(Records);
Select.execute();