X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=bin%2Fkhatus;h=da0c78cb52c0c08bae343caf016dff5837e75949;hb=0819928a2ed96fc0d56613ae16169489972fa5b3;hp=5a3d8a039b9c74f376cbf03bfc6798348c72b462;hpb=f1b794f56264cf9e5eb0c22e0c1e20735d4039fc;p=khatus.git diff --git a/bin/khatus b/bin/khatus index 5a3d8a0..da0c78c 100755 --- a/bin/khatus +++ b/bin/khatus @@ -14,18 +14,29 @@ consume() { -v opt_prefixes_of_net_interfaces_to_show="$prefixes_of_net_interfaces_to_show" } -spawn() { +run_producer() { pipe="$1" dir_bin="$2" log="$3" cmd="$4" msg_head="$5" - interval="$6" - while true; do - "$dir_bin"/$cmd | while read line; do - echo "${msg_head} $line" > "$pipe" - done \ - 2> "$log" + "$dir_bin"/$cmd | while read line; do + echo "${msg_head} $line" > "$pipe" + done \ + 2> "$log" + # TODO: Perhaps direct log to pipe, so that controller can monitor sensors? +} + +fork_reactor() { + run_producer "$@" & +} + +fork_poller() { + interval="$1" + shift + while true + do + run_producer "$@" sleep "$interval" done & } @@ -34,7 +45,8 @@ main() { # Defaults debug=0 dir_bin="$HOME/bin" - dir_data=$(mktemp -d) + dir_logs=$(mktemp -d) + file_pipe=$(mktemp) weather_station_id='KJFK' screen_brightness_device_name='acpi_video0' prefixes_of_net_interfaces_to_show='w' # comma-separated @@ -58,7 +70,6 @@ main() { interval_inp_temp=1 interval_inp_fan=1 interval_inp_mem=1 - interval_inp_energy=1 # User-overrides # --------------------------------------------------------------------- @@ -69,7 +80,8 @@ main() { long_options='' long_options+='debug' long_options+=',dir_bin:' - long_options+=',dir_data:' + long_options+=',dir_logs:' + long_options+=',file_pipe:' long_options+=',weather_station_id:' long_options+=',screen_brightness_device_name:' long_options+=',prefixes_of_net_interfaces_to_show:' @@ -92,7 +104,6 @@ main() { long_options+=',interval_inp_temp:' long_options+=',interval_inp_fan:' long_options+=',interval_inp_mem:' - long_options+=',interval_inp_energy:' OPTS=$( getopt \ -o 'd' \ @@ -111,8 +122,12 @@ main() { dir_bin="$2" shift 2 ;; - --dir_data) - dir_data="$2" + --dir_logs) + dir_logs="$2" + shift 2 + ;; + --file_pipe) + file_pipe="$2" shift 2 ;; --weather_station_id) @@ -203,10 +218,6 @@ main() { interval_inp_mem="$2" shift 2 ;; - --interval_inp_energy) - interval_inp_energy="$2" - shift 2 - ;; --) shift break @@ -214,7 +225,6 @@ main() { esac done - pipe="$dir_data/khatus_data_pipe" screen_brightness_device_path='/sys/class/backlight' screen_brightness_device_path+="/$screen_brightness_device_name" @@ -233,41 +243,42 @@ main() { echo '----------------------------------------------' ) >&2 - mkdir -p "$dir_data" - rm -f "$pipe" - mkfifo "$pipe" + rm -f "$file_pipe" + mkfifo "$file_pipe" cmd_sens_screen_brightness='khatus_sensor_screen_brightness' cmd_sens_screen_brightness+=" $screen_brightness_device_path" cmd_sens_weather="khatus_sensor_weather $weather_station_id" - cmd_sens_disk_space="khatus_sensor_disk_space $disk_space_device" - cmd_sens_disk_io="khatus_sensor_disk_io $disk_io_device" - cmd_sens_temperature="khatus_sensor_temperature $thermal_zone" - cmd_sens_fan="khatus_sensor_fan $fan_path" + cmd_sens_bluetooth="khatus_sensor_bluetooth_power $dir_bin" + cmd_sens_mpd_state="khatus_sensor_mpd_state $dir_bin" + cmd_sens_net_addr_io="khatus_sensor_net_addr_io $dir_bin" # TODO: Redirect each worker's stderr to a dedicated log file - log="$dir_data"/sensors.log - spawn "$pipe" "$dir_bin" "$log" khatus_sensor_datetime 'in:DATE_TIME' $interval_inp_datetime - spawn "$pipe" "$dir_bin" "$log" "$cmd_sens_screen_brightness" 'in:SCREEN_BRIGHTNESS' $interval_inp_brightness - spawn "$pipe" "$dir_bin" "$log" "$cmd_sens_weather" 'in:WEATHER' $interval_inp_weather - spawn "$pipe" "$dir_bin" "$log" khatus_sensor_mpd_state 'in:MPD_STATE' $interval_inp_mpd_state - spawn "$pipe" "$dir_bin" "$log" khatus_sensor_mpd_song 'in:MPD_SONG' $interval_inp_mpd_song - spawn "$pipe" "$dir_bin" "$log" khatus_sensor_volume 'in:VOLUME' $interval_inp_volume - spawn "$pipe" "$dir_bin" "$log" khatus_sensor_bluetooth_power 'in:BLUETOOTH_POWER' $interval_inp_bluetooth - spawn "$pipe" "$dir_bin" "$log" khatus_sensor_net_wifi_status 'in:NET_WIFI_STATUS' $interval_inp_net_wifi - spawn "$pipe" "$dir_bin" "$log" khatus_sensor_net_addr_io 'in:NET_ADDR_IO' $interval_inp_net_io - spawn "$pipe" "$dir_bin" "$log" "$cmd_sens_disk_space" 'in:DISK_SPACE' $interval_inp_disk_space - spawn "$pipe" "$dir_bin" "$log" "$cmd_sens_disk_io" 'in:DISK_IO' $interval_inp_disk_io - spawn "$pipe" "$dir_bin" "$log" khatus_sensor_loadavg 'in:LOAD_AVG' $interval_inp_loadavg - spawn "$pipe" "$dir_bin" "$log" "$cmd_sens_temperature" 'in:TEMPERATURE' $interval_inp_temp - spawn "$pipe" "$dir_bin" "$log" "$cmd_sens_fan" 'in:FAN' $interval_inp_fan - spawn "$pipe" "$dir_bin" "$log" khatus_sensor_memory 'in:MEMORY' $interval_inp_mem - spawn "$pipe" "$dir_bin" "$log" khatus_sensor_energy 'in:ENERGY' $interval_inp_energy + pipe="$file_pipe" + log="$dir_logs"/khatus_sensors.log + + fork_reactor "$pipe" "$dir_bin" "$log" "khatus_sensor_energy $dir_bin" 'in:ENERGY' + + fork_poller $interval_inp_datetime "$pipe" "$dir_bin" "$log" khatus_sensor_datetime 'in:DATE_TIME' + fork_poller $interval_inp_brightness "$pipe" "$dir_bin" "$log" "$cmd_sens_screen_brightness" 'in:SCREEN_BRIGHTNESS' + fork_poller $interval_inp_weather "$pipe" "$dir_bin" "$log" "$cmd_sens_weather" 'in:WEATHER' + fork_poller $interval_inp_mpd_state "$pipe" "$dir_bin" "$log" "$cmd_sens_mpd_state" 'in:MPD_STATE' + fork_poller $interval_inp_mpd_song "$pipe" "$dir_bin" "$log" khatus_sensor_mpd_song 'in:MPD_SONG' + fork_poller $interval_inp_volume "$pipe" "$dir_bin" "$log" khatus_sensor_volume 'in:VOLUME' + fork_poller $interval_inp_bluetooth "$pipe" "$dir_bin" "$log" "$cmd_sens_bluetooth" 'in:BLUETOOTH_POWER' + fork_poller $interval_inp_net_wifi "$pipe" "$dir_bin" "$log" khatus_sensor_net_wifi_status 'in:NET_WIFI_STATUS' + fork_poller $interval_inp_net_io "$pipe" "$dir_bin" "$log" "$cmd_sens_net_addr_io" 'in:NET_ADDR_IO' + fork_poller $interval_inp_disk_space "$pipe" "$dir_bin" "$log" "$cmd_sens_disk_space" 'in:DISK_SPACE' + fork_poller $interval_inp_disk_io "$pipe" "$dir_bin" "$log" "$cmd_sens_disk_io" 'in:DISK_IO' + fork_poller $interval_inp_loadavg "$pipe" "$dir_bin" "$log" khatus_sensor_loadavg 'in:LOAD_AVG' + fork_poller $interval_inp_temp "$pipe" "$dir_bin" "$log" "$cmd_sens_temperature" 'in:TEMPERATURE' + fork_poller $interval_inp_fan "$pipe" "$dir_bin" "$log" "$cmd_sens_fan" 'in:FAN' + fork_poller $interval_inp_mem "$pipe" "$dir_bin" "$log" khatus_sensor_memory 'in:MEMORY' consume \ "$pipe" \