добавил получение sysinfo и вывод аптайма в веб-морде
This commit is contained in:
@@ -206,6 +206,8 @@ public:
|
||||
rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::json)});
|
||||
std::string result = R"({"mainState":)";
|
||||
result += api->loadTerminalState();
|
||||
result += R"(,"sysinfo":)";
|
||||
result += api->loadSysInfo();
|
||||
result += "}";
|
||||
rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
|
||||
}));
|
||||
|
@@ -8,6 +8,8 @@
|
||||
#include <boost/thread.hpp>
|
||||
#include <boost/log/trivial.hpp>
|
||||
#include <boost/property_tree/json_parser.hpp>
|
||||
#include <sys/sysinfo.h>
|
||||
|
||||
|
||||
|
||||
typedef boost::property_tree::ptree::path_type json_path;
|
||||
@@ -1091,4 +1093,42 @@ void api_driver::ApiDriver::executeInApi(const std::function<void(TSID sid)>& ca
|
||||
}
|
||||
}
|
||||
|
||||
std::string api_driver::ApiDriver::loadSysInfo() {
|
||||
std::stringstream result;
|
||||
struct sysinfo info{};
|
||||
sysinfo(&info);
|
||||
|
||||
struct sysinfo {
|
||||
long uptime; /* Seconds since boot */
|
||||
unsigned long loads[3]; /* 1, 5, and 15 minute load averages */
|
||||
unsigned long totalram; /* Total usable main memory size */
|
||||
unsigned long freeram; /* Available memory size */
|
||||
unsigned long sharedram; /* Amount of shared memory */
|
||||
unsigned long bufferram; /* Memory used by buffers */
|
||||
unsigned long totalswap; /* Total swap space size */
|
||||
unsigned long freeswap; /* Swap space still available */
|
||||
unsigned short procs; /* Number of current processes */
|
||||
unsigned long totalhigh; /* Total high memory size */
|
||||
unsigned long freehigh; /* Available high memory size */
|
||||
unsigned int mem_unit; /* Memory unit size in bytes */
|
||||
};
|
||||
|
||||
result << "{\n\"uptime\":" << info.uptime;
|
||||
result << ",\"load1min\":" << info.loads[0];
|
||||
result << ",\"load5min\":" << info.loads[1];
|
||||
result << ",\"load15min\":" << info.loads[2];
|
||||
result << ",\"totalram\":" << info.totalram;
|
||||
result << ",\"freeram\":" << info.freeram;
|
||||
result << ",\"sharedram\":" << info.sharedram;
|
||||
result << ",\"bufferram\":" << info.bufferram;
|
||||
result << ",\"totalswap\":" << info.totalswap;
|
||||
result << ",\"freeswap\":" << info.freeswap;
|
||||
result << ",\"procs\":" << static_cast<long>(info.procs);
|
||||
result << ",\"totalhigh\":" << info.totalhigh;
|
||||
result << ",\"freehigh\":" << info.freehigh;
|
||||
result << ",\"mem_unit\":" << info.mem_unit;
|
||||
result << "\n}";
|
||||
return result.str();
|
||||
}
|
||||
|
||||
api_driver::ApiDriver::~ApiDriver() = default;
|
||||
|
@@ -70,6 +70,8 @@ namespace api_driver {
|
||||
|
||||
void executeInApi(const std::function<void(TSID sid)>& callback);
|
||||
|
||||
static std::string loadSysInfo();
|
||||
|
||||
~ApiDriver();
|
||||
|
||||
private:
|
||||
|
Reference in New Issue
Block a user