From c084c42794206559907c0d93f5eba8e8fe6bf6b1 Mon Sep 17 00:00:00 2001 From: uvos Date: Wed, 3 May 2023 21:08:37 +0200 Subject: [PATCH] add the option to disable output --- ipmi.cpp | 3 --- ipmifan.service | 2 +- main.cpp | 16 ++++++++++++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ipmi.cpp b/ipmi.cpp index 4795c77..e5aea0c 100644 --- a/ipmi.cpp +++ b/ipmi.cpp @@ -128,9 +128,6 @@ ipmi_ctx_t ipmi_open_context() bool ipmi_set_fan_group(ipmi_ctx_t raw_ctx, uint8_t group, double speed) { char converted_speed = std::max(std::min(static_cast(100), static_cast(speed*100)), static_cast(0)); - - std::cout<<"setting fan group "<(group)<<" to "<(converted_speed)<<")\n"; - char command[] = {0x70, 0x66, 0x01, static_cast(group), converted_speed}; char bytesrx[IPMI_RAW_MAX_ARGS] = {0}; int rxlen = ipmi_cmd_raw(raw_ctx, 0, 0x30, command, sizeof(command), bytesrx, IPMI_RAW_MAX_ARGS); diff --git a/ipmifan.service b/ipmifan.service index dd595db..30ab7df 100644 --- a/ipmifan.service +++ b/ipmifan.service @@ -4,7 +4,7 @@ After=lm_sensors.service systemd-modules-load.service [Service] Type=simple -ExecStart=/usr/bin/ipmifan +ExecStart=/usr/bin/ipmifan -q [Install] WantedBy=multi-user.target diff --git a/main.cpp b/main.cpp index 7e71117..e752719 100644 --- a/main.cpp +++ b/main.cpp @@ -23,6 +23,8 @@ void sig_handler(int sig) running = false; } +bool quiet; + std::vector gather_sensors(std::vector& ipmi_sensors, ipmi_monitoring_ctx_t ctx, std::vector& lm_chips) { std::vector out; @@ -119,6 +121,9 @@ int main(int argc, char **argv) signal(SIGHUP, sig_handler); signal(SIGINT, sig_handler); + if(argc > 1) + quiet = true; + int ret = sensors_init(nullptr); if(ret < 0) { @@ -141,9 +146,16 @@ int main(int argc, char **argv) while(running) { std::vector sensors = gather_sensors(ipmi_sensors, monitoring_ctx, lm_chips); - for(const Sensor& sensor : sensors) - std::cout<<"Sensor "< fanzones = get_fan_zones(sensors); + + if(!quiet) + { + for(const Sensor& sensor : sensors) + std::cout<<"Sensor "<