Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 22:22:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

get domainmetadata stuff compiling

Browse source
This commit is contained in:
HifiExperiments 2020-06-17 17:47:50 -07:00
parent 19ff5bfd4f
commit 8052259489
4 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
domain-server/src/DomainMetadata.cpp
View file

@ -54,22 +54,11 @@ const QString DomainMetadata::Descriptors::TAGS = "tags";
// //
// it is meant to be sent to and consumed by an external API // it is meant to be sent to and consumed by an external API
DomainMetadata::DomainMetadata(QObject* domainServer) : QObject(domainServer) { DomainMetadata::DomainMetadata() {
// set up the structure necessary for casting during parsing // set up the structure necessary for casting during parsing
_metadata[USERS] = QVariantMap {}; _metadata[USERS] = QVariantMap {};
_metadata[DESCRIPTORS] = QVariantMap {}; _metadata[DESCRIPTORS] = QVariantMap {};
assert(dynamic_cast<DomainServer*>(domainServer));
DomainServer* server = static_cast<DomainServer*>(domainServer);
// update the metadata when a user (dis)connects
connect(server, &DomainServer::userConnected, this, &DomainMetadata::usersChanged);
connect(server, &DomainServer::userDisconnected, this, &DomainMetadata::usersChanged);
// update the metadata when security changes
connect(&server->_settingsManager, &DomainServerSettingsManager::updateNodePermissions,
this, static_cast<void(DomainMetadata::*)()>(&DomainMetadata::securityChanged));
// initialize the descriptors // initialize the descriptors
securityChanged(false); securityChanged(false);
descriptorsChanged(); descriptorsChanged();

5
domain-server/src/DomainMetadata.h
View file

@ -42,8 +42,8 @@ public:
static const QString TAGS; static const QString TAGS;
}; };
DomainMetadata(QObject* domainServer); DomainMetadata();
DomainMetadata() = delete; ~DomainMetadata() = default;
// Get cached metadata // Get cached metadata
QJsonObject get(); QJsonObject get();
@ -54,7 +54,6 @@ public:
public slots: public slots:
void descriptorsChanged(); void descriptorsChanged();
void securityChanged(bool send); void securityChanged(bool send);
void securityChanged() { securityChanged(true); }
void usersChanged(); void usersChanged();
protected: protected:

11
domain-server/src/DomainServer.cpp
View file

@ -268,10 +268,17 @@ DomainServer::DomainServer(int argc, char* argv[]) :
} }
// send signal to DomainMetadata when descriptors changed // send signal to DomainMetadata when descriptors changed
_metadata = new DomainMetadata(this); _metadata = new DomainMetadata();
connect(&_settingsManager, &DomainServerSettingsManager::settingsUpdated, connect(&_settingsManager, &DomainServerSettingsManager::settingsUpdated,
_metadata, &DomainMetadata::descriptorsChanged); _metadata, &DomainMetadata::descriptorsChanged);
// update the metadata when a user (dis)connects
connect(this, &DomainServer::userConnected, _metadata, &DomainMetadata::usersChanged);
connect(this, &DomainServer::userDisconnected, _metadata, &DomainMetadata::usersChanged);
// update the metadata when security changes
connect(&_settingsManager, &DomainServerSettingsManager::updateNodePermissions, [this] { _metadata->securityChanged(true); });
qDebug() << "domain-server is running"; qDebug() << "domain-server is running";
static const QString AC_SUBNET_WHITELIST_SETTING_PATH = "security.ac_subnet_whitelist"; static const QString AC_SUBNET_WHITELIST_SETTING_PATH = "security.ac_subnet_whitelist";
@ -3086,7 +3093,7 @@ void DomainServer::initializeMetadataExporter() {
if (isMetadataExporterEnabled && !_httpMetadataExporterManager) { if (isMetadataExporterEnabled && !_httpMetadataExporterManager) {
qCInfo(domain_server) << "Starting Metadata exporter on port " << metadataExporterPort; qCInfo(domain_server) << "Starting Metadata exporter on port " << metadataExporterPort;
_httpMetadataExporterManager = new HTTPManager(QHostAddress::Any, (quint16)metadataExporterPort, QString("%1/resources/metadata_exporter/").arg(QCoreApplication::applicationDirPath()), &_metadataExporter); _httpMetadataExporterManager = new HTTPManager(QHostAddress::Any, (quint16)metadataExporterPort, QString("%1/resources/metadata_exporter/").arg(QCoreApplication::applicationDirPath()), _metadata);
} }
} }

1
domain-server/src/DomainServer.h
View file

@ -238,7 +238,6 @@ private:
DomainGatekeeper _gatekeeper; DomainGatekeeper _gatekeeper;
DomainServerExporter _exporter; DomainServerExporter _exporter;
DomainMetadata _metadataExporter;
HTTPManager _httpManager; HTTPManager _httpManager;
HTTPManager* _httpExporterManager { nullptr }; HTTPManager* _httpExporterManager { nullptr };