external/fastocloud
1
0
Fork 0
mirror of https://github.com/fastogt/fastocloud.git synced 2025-02-12 15:41:51 +00:00
Code Issues Releases Wiki Activity

Sync

Browse source
This commit is contained in:
Topilski 2024-11-03 08:11:13 +03:00
parent 310132c21d
commit 04206d0ab9
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/server/daemon/commands_info/service/details/shots.cpp
View file

@ -185,7 +185,10 @@ SysinfoShot GetMachineSysinfoShot() {
return inf;
}
memcpy(&inf.loads, &info.loads, sizeof(unsigned long) * SIZEOFMASS(info.loads));
static const double f_load = (1 << SI_LOAD_SHIFT);
inf.loads[0] = double(info.loads[0]) / f_load;
inf.loads[1] = double(info.loads[1]) / f_load;
inf.loads[2] = double(info.loads[2]) / f_load;
inf.uptime = info.uptime;
return inf;
#elif defined(OS_MACOSX) || defined(OS_FREEBSD)

2
src/server/daemon/commands_info/service/details/shots.h
View file

@ -60,7 +60,7 @@ NetShot GetMachineNetShot();
struct SysinfoShot {
SysinfoShot();
unsigned long loads[3];
double loads[3];
time_t uptime;
};

3
src/server/daemon/commands_info/service/server_info.cpp
View file

@ -37,6 +37,7 @@
#define TIMESHIFTS_DIR_FIELD "timeshifts_dir"
#define FEEDBACK_DIR_FIELD "feedback_dir"
#define DATA_DIR_FIELD "data_dir"
#define PROXY_DIR_FIELD "proxy_dir"
#define ONLINE_USERS_DAEMON_FIELD "daemon"
#define ONLINE_USERS_HTTP_FIELD "http"
@ -256,6 +257,7 @@ common::Error FullServiceInfo::DoDeSerialize(json_object* serialized) {
ignore_result(GetStringField(serialized, TIMESHIFTS_DIR_FIELD, &inf.timeshifts_dir_));
ignore_result(GetStringField(serialized, FEEDBACK_DIR_FIELD, &inf.feedback_dir_));
ignore_result(GetStringField(serialized, DATA_DIR_FIELD, &inf.data_dir_));
ignore_result(GetStringField(serialized, PROXY_DIR_FIELD, &inf.proxy_dir_));
ignore_result(GetStringField(serialized, PROJECT_FIELD, &inf.project_));
ignore_result(GetStringField(serialized, VERSION_FIELD, &inf.proj_ver_));
ignore_result(GetStringField(serialized, VSYSTEM_FIELD, &inf.vsystem_));
@ -285,6 +287,7 @@ common::Error FullServiceInfo::SerializeFields(json_object* out) const {
ignore_result(SetStringField(out, TIMESHIFTS_DIR_FIELD, timeshifts_dir_));
ignore_result(SetStringField(out, FEEDBACK_DIR_FIELD, feedback_dir_));
ignore_result(SetStringField(out, DATA_DIR_FIELD, data_dir_));
ignore_result(SetStringField(out, PROXY_DIR_FIELD, proxy_dir_));
ignore_result(SetStringField(out, VERSION_FIELD, proj_ver_));
ignore_result(SetStringField(out, PROJECT_FIELD, project_));
ignore_result(SetObjectField(out, OS_FIELD, jos));