From 9e478ba4587ae7c53f3c28a8e3ca4882373fe35e Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Fri, 29 May 2020 20:07:51 +0200 Subject: [PATCH] More variable renaming --- domain-server/src/DomainServer.h | 2 +- domain-server/src/DomainServerExporter.cpp | 86 +++++++++++----------- domain-server/src/DomainServerExporter.h | 2 +- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h index 46968c7a0c..7c0fa5fb15 100644 --- a/domain-server/src/DomainServer.h +++ b/domain-server/src/DomainServer.h @@ -239,7 +239,7 @@ private: DomainServerExporter _exporter; HTTPManager _httpManager; - HTTPManager *_httpExporterManager { nullptr }; + HTTPManager* _httpExporterManager { nullptr }; std::unique_ptr _httpsManager; QHash _allAssignments; diff --git a/domain-server/src/DomainServerExporter.cpp b/domain-server/src/DomainServerExporter.cpp index 80af5f37db..f48f77422f 100644 --- a/domain-server/src/DomainServerExporter.cpp +++ b/domain-server/src/DomainServerExporter.cpp @@ -280,9 +280,9 @@ bool DomainServerExporter::handleHTTPRequest(HTTPConnection* connection, const Q if (url.path() == URI_METRICS) { auto nodeList = DependencyManager::get(); QString output = ""; - QTextStream out_stream(&output); + QTextStream outStream(&output); - nodeList->eachNode([this, &out_stream](const SharedNodePointer& node) { generateMetricsForNode(out_stream, node); }); + nodeList->eachNode([this, &outStream](const SharedNodePointer& node) { generateMetricsForNode(outStream, node); }); connection->respond(HTTPConnection::StatusCode200, output.toUtf8(), qPrintable(EXPORTER_MIME_TYPE)); return true; @@ -292,7 +292,7 @@ bool DomainServerExporter::handleHTTPRequest(HTTPConnection* connection, const Q } QString DomainServerExporter::escapeName(const QString& name) { - QRegularExpression invalid_characters("[^A-Za-z0-9_]"); + QRegularExpression invalidCharacters("[^A-Za-z0-9_]"); QString ret = name; @@ -311,7 +311,7 @@ QString DomainServerExporter::escapeName(const QString& name) { ret.replace(QRegularExpression("([a-z])([A-Z])"), "\\1_\\2"); // Replace all invalid characters with a _ - ret.replace(invalid_characters, "_"); + ret.replace(invalidCharacters, "_"); // Remove any "_" characters at the beginning or end ret.replace(QRegularExpression("^_+"), ""); @@ -328,69 +328,69 @@ QString DomainServerExporter::escapeName(const QString& name) { void DomainServerExporter::generateMetricsForNode(QTextStream& stream, const SharedNodePointer& node) { QString ret = ""; QJsonObject statsObject = static_cast(node->getLinkedData())->getStatsJSONObject(); - QString node_type = NodeType::getNodeTypeName(static_cast(node->getType())); + QString nodeType = NodeType::getNodeTypeName(static_cast(node->getType())); stream << "\n\n\n"; stream << "###############################################################\n"; - stream << "# " << node_type << "\n"; + stream << "# " << nodeType << "\n"; stream << "###############################################################\n"; - generateMetricsFromJson(stream, node_type, escapeName(node_type), QHash(), statsObject); + generateMetricsFromJson(stream, nodeType, escapeName(nodeType), QHash(), statsObject); QJsonDocument doc(statsObject); ret.append(doc.toJson()); } void DomainServerExporter::generateMetricsFromJson(QTextStream& stream, - QString original_path, + QString originalPath, QString path, QHash labels, - const QJsonObject& obj) { - for (auto iter = obj.constBegin(); iter != obj.constEnd(); ++iter) { - auto escaped_key = escapeName(iter.key()); - auto metric_value = iter.value(); - auto metric_name = path + "_" + escaped_key; - auto orig_metric_name = original_path + " -> " + iter.key(); + const QJsonObject& root) { + for (auto iter = root.constBegin(); iter != root.constEnd(); ++iter) { + auto escapedKey = escapeName(iter.key()); + auto metricValue = iter.value(); + auto metricName = path + "_" + escapedKey; + auto origMetricName = originalPath + " -> " + iter.key(); - if (metric_value.isObject()) { + if (metricValue.isObject()) { QUuid possible_uuid = QUuid::fromString(iter.key()); if (possible_uuid.isNull()) { - generateMetricsFromJson(stream, original_path + " -> " + iter.key(), path + "_" + escaped_key, labels, + generateMetricsFromJson(stream, originalPath + " -> " + iter.key(), path + "_" + escapedKey, labels, iter.value().toObject()); } else { labels.insert("uuid", possible_uuid.toString(QUuid::WithoutBraces)); - generateMetricsFromJson(stream, original_path, path, labels, iter.value().toObject()); + generateMetricsFromJson(stream, originalPath, path, labels, iter.value().toObject()); } continue; } - if (BLACKLIST.contains(metric_name)) { + if (BLACKLIST.contains(metricName)) { continue; } - bool conversion_ok = false; + bool conversionOk = false; double converted = 0; - if (metric_value.isString()) { + if (metricValue.isString()) { // Prometheus only deals with numeric values. See if this string contains a valid one - QString tmp = metric_value.toString(); - converted = tmp.toDouble(&conversion_ok); + QString tmp = metricValue.toString(); + converted = tmp.toDouble(&conversionOk); - if (!conversion_ok) { - qCWarning(domain_server_exporter) << "Failed to convert value of " << orig_metric_name << " (" << metric_name + if (!conversionOk) { + qCWarning(domain_server_exporter) << "Failed to convert value of " << origMetricName << " (" << metricName << ") to double: " << tmp << "'"; continue; } } - stream << QString("\n# HELP %1 %2 -> %3\n").arg(metric_name).arg(original_path).arg(iter.key()); + stream << QString("\n# HELP %1 %2 -> %3\n").arg(metricName).arg(originalPath).arg(iter.key()); - if (TYPE_MAP.contains(metric_name)) { - stream << "# TYPE " << metric_name << " "; - switch (TYPE_MAP[metric_name]) { + if (TYPE_MAP.contains(metricName)) { + stream << "# TYPE " << metricName << " "; + switch (TYPE_MAP[metricName]) { case DomainServerExporter::MetricType::Untyped: stream << "untyped"; break; @@ -410,47 +410,47 @@ void DomainServerExporter::generateMetricsFromJson(QTextStream& stream, stream << "\n"; } else { qCWarning(domain_server_exporter) - << "Type for metric " << orig_metric_name << " (" << metric_name << ") not known."; + << "Type for metric " << origMetricName << " (" << metricName << ") not known."; } - stream << path << "_" << escaped_key; + stream << path << "_" << escapedKey; if (!labels.isEmpty()) { stream << "{"; - bool is_first = true; + bool isFirst = true; QHashIterator iter(labels); while (iter.hasNext()) { iter.next(); - if (!is_first) { + if (!isFirst) { stream << ","; } - QString escaped_value = iter.value(); - escaped_value.replace("\\", "\\\\"); - escaped_value.replace("\"", "\\\""); - escaped_value.replace("\n", "\\\n"); + QString escapedValue = iter.value(); + escapedValue.replace("\\", "\\\\"); + escapedValue.replace("\"", "\\\""); + escapedValue.replace("\n", "\\\n"); - stream << iter.key() << "=\"" << escaped_value << "\""; + stream << iter.key() << "=\"" << escapedValue << "\""; - is_first = false; + isFirst = false; } stream << "}"; } stream << " "; - if (metric_value.isBool()) { + if (metricValue.isBool()) { stream << (iter.value().toBool() ? "1" : "0"); - } else if (metric_value.isDouble()) { - stream << metric_value.toDouble(); - } else if (metric_value.isString()) { + } else if (metricValue.isDouble()) { + stream << metricValue.toDouble(); + } else if (metricValue.isString()) { // Converted above stream << converted; } else { qCWarning(domain_server_exporter) - << "Can't convert metric " << orig_metric_name << "(" << metric_name << ") with value " << metric_value; + << "Can't convert metric " << origMetricName << "(" << metricName << ") with value " << metricValue; } stream << "\n"; diff --git a/domain-server/src/DomainServerExporter.h b/domain-server/src/DomainServerExporter.h index d818ad8114..d823c44c99 100644 --- a/domain-server/src/DomainServerExporter.h +++ b/domain-server/src/DomainServerExporter.h @@ -48,7 +48,7 @@ public: private: QString escapeName(const QString &name); - void generateMetricsForNode( QTextStream &stream, const SharedNodePointer &node ); + void generateMetricsForNode(QTextStream &stream, const SharedNodePointer &node); void generateMetricsFromJson(QTextStream &stream, QString original_path, QString path, QHash labels, const QJsonObject &obj); };