diff --git a/src/modules/node_info/files/Config.pm b/src/modules/node_info/files/Config.pm index 2edc9c3..d5f552a 100644 --- a/src/modules/node_info/files/Config.pm +++ b/src/modules/node_info/files/Config.pm @@ -17,7 +17,7 @@ our @EXPORT_OK = qw( # Debug / Version # ============================================================================ -our $DEBUG_ENABLED = 1; +our $DEBUG_ENABLED; # derived from %config{debug}{mod_debug} after ini load, below our $VERSION = 'version-placeholder'; # ============================================================================ @@ -43,6 +43,7 @@ our %config = ( gpu_history => 0, }, debug => { + mod_debug => 0, log_enabled => 0, log_file => '/tmp/pve-mod-debug.log', lm_sensors_mode => 0, @@ -159,4 +160,6 @@ sub _load_ini_file { _load_ini_file($CONF_FILE); _load_ini_file($_) for glob("$CONFD_DIR/*.conf"); +$DEBUG_ENABLED = $config{debug}{mod_debug}; + 1; diff --git a/src/modules/node_info/node_info.conf b/src/modules/node_info/node_info.conf index 7e2d349..2008fcc 100644 --- a/src/modules/node_info/node_info.conf +++ b/src/modules/node_info/node_info.conf @@ -30,7 +30,11 @@ ignore_temp_below=5 # Debug mode: when a collector's mode is 1, the real tool is not required. # Data is read from the file path instead. Useful for development/testing. +# Note: debug settings are only read at pveproxy startup — restart pveproxy +# after changing them. Debug output goes to the journal (journalctl -u pveproxy), +# plus log_file if log_enabled=1. [debug] +mod_debug=0 lm_sensors_mode=0 lm_sensors_output_file=/tmp/sensors-output.json intel_mode=0 diff --git a/src/modules/node_info/node_info.configure.sh b/src/modules/node_info/node_info.configure.sh index ae647ab..84bab54 100644 --- a/src/modules/node_info/node_info.configure.sh +++ b/src/modules/node_info/node_info.configure.sh @@ -78,6 +78,7 @@ node_info_defaults() { DEBUG_AMD=0; DEBUG_AMD_FILE="/tmp/amd-gpu-devices.json" DEBUG_UPS=0; DEBUG_UPS_FILE="/tmp/ups-output.json" DEBUG_LOG=0; DEBUG_LOG_FILE="/tmp/pve-mod-debug.log" + DEBUG_MOD=0 } node_info_load_conf() { @@ -124,6 +125,7 @@ node_info_load_conf() { debug.ups_output_file) DEBUG_UPS_FILE="$val" ;; debug.log_enabled) DEBUG_LOG="$val" ;; debug.log_file) DEBUG_LOG_FILE="$val" ;; + debug.mod_debug) DEBUG_MOD="$val" ;; esac done < "$NODE_INFO_CONF" } @@ -512,7 +514,11 @@ ignore_temp_below=${IGNORE_TEMP_BELOW} # Debug mode: when a collector's mode is 1, the real tool is not required. # Data is read from the file path instead. Useful for development/testing. +# Note: debug settings are only read at pveproxy startup — restart pveproxy +# after changing them. Debug output goes to the journal (journalctl -u pveproxy), +# plus log_file if log_enabled=1. [debug] +mod_debug=${DEBUG_MOD} lm_sensors_mode=${DEBUG_LM_SENSORS} lm_sensors_output_file=${DEBUG_LM_SENSORS_FILE} intel_mode=${DEBUG_INTEL}