Browse Source

Merge pull request #3010 from Wahaj18/fix-2999-sondehub-batch-upload

SondeHub: batch telemetry uploads and send listener position every 3 hours
chirpmodem-v8.0.0
Edouard Griffiths 1 month ago committed by GitHub
parent
commit
d6a63649e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      plugins/feature/radiosonde/radiosondegui.h
  2. 41
      sdrbase/util/sondehub.cpp
  3. 7
      sdrbase/util/sondehub.h

2
plugins/feature/radiosonde/radiosondegui.h

@ -110,7 +110,7 @@ private: @@ -110,7 +110,7 @@ private:
QDateTime m_lastPositionUpdate;
QTimer m_positionUpdateTimer;
static const int m_minMobilePositionUpdateTime = 30; // In seconds
static const int m_minFixedPositionUpdateTime = 5 * 60;
static const int m_minFixedPositionUpdateTime = 3 * 60 * 60;
QTimer m_predicitionTimer;
QStringList m_predictions;

41
sdrbase/util/sondehub.cpp

@ -29,6 +29,8 @@ SondeHub::SondeHub() @@ -29,6 +29,8 @@ SondeHub::SondeHub()
{
m_networkManager = new QNetworkAccessManager();
connect(m_networkManager, &QNetworkAccessManager::finished, this, &SondeHub::handleReply);
connect(&m_uploadTimer, &QTimer::timeout, this, &SondeHub::uploadQueuedTelemetry);
m_uploadTimer.start(m_uploadPeriodMs);
}
SondeHub::~SondeHub()
@ -128,11 +130,21 @@ void SondeHub::upload( @@ -128,11 +130,21 @@ void SondeHub::upload(
//obj.insert("dev", true);
//qDebug() << obj;
QJsonArray payloads {
obj
};
m_telemetryQueue.append(obj);
while (m_telemetryQueue.size() > m_maxQueueSize) {
m_telemetryQueue.removeFirst();
}
}
void SondeHub::uploadQueuedTelemetry()
{
if (m_telemetryQueue.isEmpty() || m_telemetryReply) {
return;
}
QJsonDocument doc(payloads);
m_telemetryInFlight = m_telemetryQueue;
m_telemetryQueue = QJsonArray();
QJsonDocument doc(m_telemetryInFlight);
QByteArray data = doc.toJson();
QUrl url(QString("https://api.v2.sondehub.org/sondes/telemetry"));
@ -142,7 +154,7 @@ void SondeHub::upload( @@ -142,7 +154,7 @@ void SondeHub::upload(
request.setHeader(QNetworkRequest::UserAgentHeader, "sdrangel");
request.setRawHeader("Date", QDateTime::currentDateTimeUtc().toString(Qt::ISODateWithMs).toLatin1());
m_networkManager->put(request, data);
m_telemetryReply = m_networkManager->put(request, data);
}
void SondeHub::updatePosition(
@ -196,6 +208,25 @@ void SondeHub::getPrediction(const QString& serial) @@ -196,6 +208,25 @@ void SondeHub::getPrediction(const QString& serial)
void SondeHub::handleReply(QNetworkReply* reply)
{
if (reply && (reply == m_telemetryReply))
{
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
if (reply->error() || (status < 200) || (status >= 300))
{
// Requeue failed batch ahead of newer telemetry
for (const auto& value : m_telemetryQueue) {
m_telemetryInFlight.append(value);
}
m_telemetryQueue = m_telemetryInFlight;
while (m_telemetryQueue.size() > m_maxQueueSize) {
m_telemetryQueue.removeFirst();
}
}
m_telemetryInFlight = QJsonArray();
m_telemetryReply = nullptr;
}
if (reply)
{
if (!reply->error())

7
sdrbase/util/sondehub.h

@ -72,6 +72,7 @@ public: @@ -72,6 +72,7 @@ public:
private slots:
void handleReply(QNetworkReply* reply);
void uploadQueuedTelemetry();
signals:
void prediction(const QString& serial, const QList<Position>& path);
@ -79,6 +80,12 @@ signals: @@ -79,6 +80,12 @@ signals:
private:
QNetworkAccessManager *m_networkManager;
QJsonArray m_telemetryQueue;
QJsonArray m_telemetryInFlight;
QNetworkReply *m_telemetryReply = nullptr;
QTimer m_uploadTimer;
static const int m_uploadPeriodMs = 15000; // SondeHub asks for uploads no more often than every 15s
static const int m_maxQueueSize = 1000;
};

Loading…
Cancel
Save