Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1880 from pi-hole/fix/chronometer_localhost

Browse source 
Small improvement for Chronometer
This commit is contained in:
DL6ER 2017-12-30 17:51:59 +01:00 committed by GitHub
commit 5254fc6efe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
advanced/Scripts/chronometer.sh
View file

@ -15,7 +15,7 @@ pihole-FTL() {
ftl_port=$(cat /var/run/pihole-FTL.port 2> /dev/null) ftl_port=$(cat /var/run/pihole-FTL.port 2> /dev/null)
if [[ -n "$ftl_port" ]]; then if [[ -n "$ftl_port" ]]; then
# Open connection to FTL # Open connection to FTL
exec 3<>"/dev/tcp/localhost/$ftl_port" exec 3<>"/dev/tcp/127.0.0.1/$ftl_port"
# Test if connection is open # Test if connection is open
if { "true" >&3; } 2> /dev/null; then if { "true" >&3; } 2> /dev/null; then
@ -122,13 +122,13 @@ get_init_stats() {
} }
# Convert seconds to human-readable format # Convert seconds to human-readable format
hrSecs() { hrSecs() {
day=$(( $1/60/60/24 )); hrs=$(( $1/3600%24 )) day=$(( $1/60/60/24 )); hrs=$(( $1/3600%24 ))
mins=$(( ($1%3600)/60 )); secs=$(( $1%60 )) mins=$(( ($1%3600)/60 )); secs=$(( $1%60 ))
[[ "$day" -ge "2" ]] && plu="s" [[ "$day" -ge "2" ]] && plu="s"
[[ "$day" -ge "1" ]] && days="$day day${plu}, " || days="" [[ "$day" -ge "1" ]] && days="$day day${plu}, " || days=""
printf "%s%02d:%02d:%02d\\n" "$days" "$hrs" "$mins" "$secs" printf "%s%02d:%02d:%02d\\n" "$days" "$hrs" "$mins" "$secs"
} }
# Set Colour Codes # Set Colour Codes
coltable="/opt/pihole/COL_TABLE" coltable="/opt/pihole/COL_TABLE"
@ -199,7 +199,7 @@ get_init_stats() {
# Test existence of temperature file # Test existence of temperature file
if [[ -f "/sys/class/thermal/thermal_zone0/temp" ]]; then if [[ -f "/sys/class/thermal/thermal_zone0/temp" ]]; then
temp_file="/sys/class/thermal/thermal_zone0/temp" temp_file="/sys/class/thermal/thermal_zone0/temp"
elif [[ -f "/sys/class/hwmon/hwmon0/temp1_input" ]]; then elif [[ -f "/sys/class/hwmon/hwmon0/temp1_input" ]]; then
temp_file="/sys/class/hwmon/hwmon0/temp1_input" temp_file="/sys/class/hwmon/hwmon0/temp1_input"
else else
temp_file="" temp_file=""
@ -531,7 +531,7 @@ chronoFunc() {
sleep 5 sleep 5
fi fi
fi fi
done done
} }