Reopening leases file on every reading

This commit is contained in:
Selim Mustafaev 2024-01-04 15:44:45 +03:00
parent db34e6c37a
commit 3a288fbf42
3 changed files with 3 additions and 28 deletions

View File

@ -3,33 +3,21 @@
// //
#include "DnsmasqSource.h" #include "DnsmasqSource.h"
#include <exception>
#include <sstream> #include <sstream>
#include <iostream>
#include <ranges> #include <ranges>
#include <array>
#include <algorithm>
namespace views = std::ranges::views;
DnsmasqSource::DnsmasqSource() { DnsmasqSource::DnsmasqSource() {
_leases.open("/var/lib/misc/dnsmasq.leases");
if(_leases.fail()) {
throw std::runtime_error("failed to open leases file");
}
} }
std::vector<prometheus::Labels> DnsmasqSource::readLeases() { std::vector<prometheus::Labels> DnsmasqSource::readLeases() {
_leases.clear(); std::ifstream leases("/var/lib/misc/dnsmasq.leases");
_leases.seekg(0);
std::string line; std::string line;
std::vector<prometheus::Labels> result; std::vector<prometheus::Labels> result;
auto labels = std::array{ "time", "mac", "ip", "host", "id" }; auto labels = std::array{ "time", "mac", "ip", "host", "id" };
while(std::getline(_leases, line)) { while(std::getline(leases, line)) {
prometheus::Labels lineMap; prometheus::Labels lineMap;
for(const auto [index, item]: std::views::split(line, ' ') | views::enumerate) { for(const auto [index, item]: std::views::split(line, ' ') | std::views::enumerate) {
lineMap[labels[index]] = std::string_view(item); lineMap[labels[index]] = std::string_view(item);
} }
result.push_back(lineMap); result.push_back(lineMap);

View File

@ -10,18 +10,6 @@
#include <vector> #include <vector>
class DnsmasqSource { class DnsmasqSource {
public:
enum LeaseField: int {
EXPIRY_TIME = 0,
MAC = 1,
IP = 2,
HOST = 3,
ID = 4
};
private:
std::ifstream _leases;
public: public:
DnsmasqSource(); DnsmasqSource();
std::vector<prometheus::Labels> readLeases(); std::vector<prometheus::Labels> readLeases();

View File

@ -24,7 +24,6 @@ int main() {
std::this_thread::sleep_for(std::chrono::seconds(1)); std::this_thread::sleep_for(std::chrono::seconds(1));
for(const auto& leaseLabels: dnsmasq.readLeases()) { for(const auto& leaseLabels: dnsmasq.readLeases()) {
gouge.Add(leaseLabels).Set(1); gouge.Add(leaseLabels).Set(1);
std::cout << "mac: " << leaseLabels.at("mac") << std::endl;
} }
} }