add ha test.

This commit is contained in:
amass 2024-05-03 22:30:46 +08:00
parent be7fb5bb8a
commit 5cf24d07f8
8 changed files with 163 additions and 25 deletions

View File

@ -5,7 +5,7 @@
"includePath": [ "includePath": [
"${workspaceFolder}/**", "${workspaceFolder}/**",
"${workspaceFolder}/build/_deps/kylin-src/Universal", "${workspaceFolder}/build/_deps/kylin-src/Universal",
"/opt/Libraries/boost_1_84_0/include" "/opt/Libraries/boost_1_85_0/include"
], ],
"defines": [], "defines": [],
"compilerPath": "/usr/bin/gcc", "compilerPath": "/usr/bin/gcc",

View File

@ -5,6 +5,7 @@
#include "IoContext.h" #include "IoContext.h"
#include "ServiceLogic.h" #include "ServiceLogic.h"
#include "ServiceManager.h" #include "ServiceManager.h"
#include "SystemUsage.h"
#include "WeChatContext/CorporationContext.h" #include "WeChatContext/CorporationContext.h"
Application::Application(const std::string &path) Application::Application(const std::string &path)
@ -122,6 +123,9 @@ Application::Application(const std::string &path)
m_ioContext = Amass::Singleton<IoContext>::instance<Amass::Construct>(getThreads()); m_ioContext = Amass::Singleton<IoContext>::instance<Amass::Construct>(getThreads());
m_timer = std::make_shared<boost::asio::system_timer>(*m_ioContext->ioContext()); m_timer = std::make_shared<boost::asio::system_timer>(*m_ioContext->ioContext());
m_systemUsage = std::make_shared<SystemUsage>(*m_ioContext->ioContext(), getHomeAssistantAccessToken());
m_systemUsage->start();
alarmTask(); alarmTask();
} }

View File

@ -10,6 +10,7 @@
class HttpSession; class HttpSession;
class ChatRoom; class ChatRoom;
class SystemUsage;
class IoContext; class IoContext;
class Application : public ApplicationSettings<Application>, public std::enable_shared_from_this<Application> { class Application : public ApplicationSettings<Application>, public std::enable_shared_from_this<Application> {
@ -22,6 +23,7 @@ public:
BUILD_SETTING(uint16_t, Port, 8081); BUILD_SETTING(uint16_t, Port, 8081);
BUILD_SETTING(uint32_t, Threads, std::thread::hardware_concurrency()); BUILD_SETTING(uint32_t, Threads, std::thread::hardware_concurrency());
BUILD_SETTING(std::string, DocumentRoot, "."); BUILD_SETTING(std::string, DocumentRoot, ".");
BUILD_SETTING(std::string, HomeAssistantAccessToken, "");
INITIALIZE_FIELDS(Server, Port, Threads, DocumentRoot); INITIALIZE_FIELDS(Server, Port, Threads, DocumentRoot);
Application(const std::string &path); Application(const std::string &path);
@ -40,6 +42,7 @@ private:
std::shared_ptr<boost::urls::router<RequestHandler>> m_router; std::shared_ptr<boost::urls::router<RequestHandler>> m_router;
std::shared_ptr<boost::asio::system_timer> m_timer; std::shared_ptr<boost::asio::system_timer> m_timer;
std::shared_ptr<ChatRoom> m_charRoom; std::shared_ptr<ChatRoom> m_charRoom;
std::shared_ptr<SystemUsage> m_systemUsage;
}; };
#endif // __SETTINGS_H__ #endif // __SETTINGS_H__

View File

@ -11,6 +11,7 @@ add_executable(Server main.cpp
ResponseUtility.h ResponseUtility.cpp ResponseUtility.h ResponseUtility.cpp
ServiceLogic.h ServiceLogic.inl ServiceLogic.cpp ServiceLogic.h ServiceLogic.inl ServiceLogic.cpp
ServiceManager.h ServiceManager.h
SystemUsage.h SystemUsage.cpp
UdpServer.h UdpServer.cpp UdpServer.h UdpServer.cpp
WeChatContext/CorporationContext.h WeChatContext/CorporationContext.cpp WeChatContext/CorporationContext.h WeChatContext/CorporationContext.cpp
WeChatContext/WeChatContext.h WeChatContext/WeChatContext.cpp WeChatContext/WeChatContext.h WeChatContext/WeChatContext.cpp

96
Server/SystemUsage.cpp Normal file
View File

@ -0,0 +1,96 @@
#include "SystemUsage.h"
#include "BoostLog.h"
#include "NetworkUtility.h"
#include <boost/json/object.hpp>
#include <boost/json/serialize.hpp>
#include <fstream>
#include <sstream>
#include <sys/statvfs.h>
#include <sys/sysinfo.h>
SystemUsage::SystemUsage(boost::asio::io_context &ioContext, const std::string &accessToken)
: m_ioContext(ioContext), m_accessToken(accessToken) {
m_timer = std::make_shared<boost::asio::system_timer>(m_ioContext);
// LOG(info) << "access token: " << m_accessToken;
}
void SystemUsage::start() {
m_timer->expires_after(std::chrono::seconds(10));
m_timer->async_wait([this](const boost::system::error_code &error) {
if (error) {
LOG(error) << error.message();
return;
}
auto currentCpuStats = readCpuData();
int usage = 100.0f * cpuUsage(m_lastCpuStats, currentCpuStats);
publish("yuyun_cpu_usage", usage, "%", "CPU占用率");
publish("yuyun_disk_usage", static_cast<int>(100.0f * diskUsage("/")), "%", "磁盘占用率");
m_lastCpuStats = currentCpuStats;
start();
});
}
void SystemUsage::publish(const std::string_view &deviceName, float value, const std::string_view &unit,
const std::string_view &friendlyName) {
// LOG(info) << "cpu usage: " << usage << "%";
Http::Client http(m_ioContext, Http::Transparent);
std::ostringstream oss;
oss << "Bearer " << m_accessToken;
http.addRequestField(boost::beast::http::field::authorization, oss.str());
http.addRequestField(boost::beast::http::field::content_type, "application/json");
boost::json::object request;
request["state"] = value;
boost::json::object attributes;
attributes["unit_of_measurement"] = unit;
attributes["friendly_name"] = friendlyName;
request["attributes"] = std::move(attributes);
oss.str("");
oss << "/api/states/sensor." << deviceName;
boost::system::error_code error;
auto reply = http.post("iot.amass.fun", "80", oss.str(), boost::json::serialize(request), error);
if (error) {
LOG(error) << error.message();
}
}
SystemUsage::CpuStats SystemUsage::readCpuData() {
CpuStats result;
std::ifstream proc_stat("/proc/stat");
if (proc_stat.good()) {
std::string line;
getline(proc_stat, line);
unsigned int *stats_p = (unsigned int *)&result;
std::stringstream iss(line);
std::string cpu;
iss >> cpu;
while (iss >> *stats_p) {
stats_p++;
};
}
proc_stat.close();
return result;
}
float SystemUsage::cpuUsage(const CpuStats &first, const CpuStats &second) {
const float active_time = static_cast<float>(second.totalActive() - first.totalActive());
const float idle_time = static_cast<float>(second.totalIdle() - first.totalIdle());
const float total_time = active_time + idle_time;
return active_time / total_time;
}
float SystemUsage::diskUsage(const std::string &disk) {
struct statvfs diskData;
statvfs(disk.c_str(), &diskData);
auto total = diskData.f_blocks;
auto free = diskData.f_bfree;
auto diff = total - free;
float result = static_cast<float>(diff) / total;
return result;
}

48
Server/SystemUsage.h Normal file
View File

@ -0,0 +1,48 @@
#ifndef __SYSTEMUSAGE_H__
#define __SYSTEMUSAGE_H__
#include <boost/asio/system_timer.hpp>
/**
* @brief https://github.com/improvess/cpp-linux-system-stats
*
*/
class SystemUsage {
public:
struct CpuStats { // see http://www.linuxhowtos.org/manpages/5/proc.htm
int user;
int nice;
int system;
int idle;
int iowait;
int irq;
int softirq;
int steal;
int guest;
int guestNice;
int totalIdle() const {
return idle + iowait;
}
int totalActive() const {
return user + nice + system + irq + softirq + steal + guest + guestNice;
}
};
SystemUsage(boost::asio::io_context &ioContext, const std::string &accessToken);
void start();
protected:
void publish(const std::string_view &deviceName, float value, const std::string_view &unit,
const std::string_view &friendlyName);
CpuStats readCpuData();
float cpuUsage(const CpuStats &first, const CpuStats &second);
float diskUsage(const std::string &disk);
private:
boost::asio::io_context &m_ioContext;
std::shared_ptr<boost::asio::system_timer> m_timer;
std::string m_accessToken;
CpuStats m_lastCpuStats;
};
#endif // __SYSTEMUSAGE_H__

View File

@ -89,13 +89,13 @@ http {
server { server {
listen 443 ssl; listen 443 ssl;
server_name chatgpt.amass.fun; server_name iot.amass.fun;
client_header_timeout 120s; client_header_timeout 120s;
client_body_timeout 120s; client_body_timeout 120s;
ssl_certificate cert/chatgpt.amass.fun.pem; ssl_certificate cert/iot.amass.fun.pem;
ssl_certificate_key cert/chatgpt.amass.fun.key; ssl_certificate_key cert/iot.amass.fun.key;
ssl_session_timeout 5m; #缓存有效期 ssl_session_timeout 5m; #缓存有效期
ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; #加密算法 ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; #加密算法
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; #安全链接可选的加密协议 ssl_protocols TLSv1 TLSv1.1 TLSv1.2; #安全链接可选的加密协议
@ -115,20 +115,8 @@ http {
} }
server { server {
listen 443 ssl; listen 80;
server_name pve.amass.fun; server_name iot.amass.fun;
client_header_timeout 120s;
client_body_timeout 120s;
client_max_body_size 512m;
ssl_certificate cert/pve.amass.fun.pem;
ssl_certificate_key cert/pve.amass.fun.key;
ssl_session_timeout 5m; #缓存有效期
ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; #加密算法
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; #安全链接可选的加密协议
ssl_prefer_server_ciphers on; #使用服务器端的首选算法
location / { location / {
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
@ -299,12 +287,6 @@ http {
} }
} }
server {
listen 80;
server_name pve.amass.fun;
rewrite ^(.*)$ https://pve.amass.fun$1 permanent;
}
server { server {
listen 80; listen 80;
server_name gitea.amass.fun; server_name gitea.amass.fun;

View File

@ -14,7 +14,7 @@ function cmake_scan() {
-S ${base_path} \ -S ${base_path} \
-B ${build_path} \ -B ${build_path} \
-DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug \
-DBOOST_ROOT=${libraries_root}/boost_1_84_0 -DBOOST_ROOT=${libraries_root}/boost_1_85_0
} }
function build() { function build() {
@ -46,6 +46,10 @@ function deploy() {
nohup ./HttpServer >logs/HttpServer.log 2>&1 &" nohup ./HttpServer >logs/HttpServer.log 2>&1 &"
} }
function init(){
scp -r /opt/Libraries/boost_1_85_0 root@amass.fun:/opt/Libraries/
}
function main() { function main() {
local cmd=$1 local cmd=$1
shift 1 shift 1