home
/
code
/
khatus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
da0b529
)
Allow passing log dir and pipe as CLI options
author
Siraaj Khandkar
<siraaj@khandkar.net>
Wed, 1 Aug 2018 01:33:12 +0000
(21:33 -0400)
committer
Siraaj Khandkar
<siraaj@khandkar.net>
Wed, 1 Aug 2018 01:33:12 +0000
(21:33 -0400)
bin/khatus
patch
|
blob
|
blame
|
history
diff --git
a/bin/khatus
b/bin/khatus
index
5a3d8a0
..
b58d2a2
100755
(executable)
--- a/
bin/khatus
+++ b/
bin/khatus
@@
-34,7
+34,8
@@
main() {
# Defaults
debug=0
dir_bin="$HOME/bin"
# 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
weather_station_id='KJFK'
screen_brightness_device_name='acpi_video0'
prefixes_of_net_interfaces_to_show='w' # comma-separated
@@
-69,7
+70,8
@@
main() {
long_options=''
long_options+='debug'
long_options+=',dir_bin:'
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:'
long_options+=',weather_station_id:'
long_options+=',screen_brightness_device_name:'
long_options+=',prefixes_of_net_interfaces_to_show:'
@@
-111,8
+113,12
@@
main() {
dir_bin="$2"
shift 2
;;
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)
shift 2
;;
--weather_station_id)
@@
-214,7
+220,6
@@
main() {
esac
done
esac
done
- pipe="$dir_data/khatus_data_pipe"
screen_brightness_device_path='/sys/class/backlight'
screen_brightness_device_path+="/$screen_brightness_device_name"
screen_brightness_device_path='/sys/class/backlight'
screen_brightness_device_path+="/$screen_brightness_device_name"
@@
-233,9
+238,8
@@
main() {
echo '----------------------------------------------'
) >&2
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_screen_brightness='khatus_sensor_screen_brightness'
cmd_sens_screen_brightness+=" $screen_brightness_device_path"
@@
-251,7
+255,8
@@
main() {
cmd_sens_fan="khatus_sensor_fan $fan_path"
# TODO: Redirect each worker's stderr to a dedicated log file
cmd_sens_fan="khatus_sensor_fan $fan_path"
# TODO: Redirect each worker's stderr to a dedicated log file
- log="$dir_data"/sensors.log
+ pipe="$file_pipe"
+ log="$dir_logs"/khatus_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_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
This page took
0.033233 seconds
and
4
git commands to generate.