Copy working temp to final location.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
This commit is contained in:
parent
e9f1ca338f
commit
0a0c3a2fb7
|
@ -43,16 +43,11 @@ cat << EOM
|
||||||
::: Please read and note any issues, and follow any directions advised during this process.
|
::: Please read and note any issues, and follow any directions advised during this process.
|
||||||
EOM
|
EOM
|
||||||
|
|
||||||
# Ensure the file exists, create if not, clear if exists.
|
|
||||||
truncate --size=0 "${DEBUG_LOG}"
|
|
||||||
chmod 644 ${DEBUG_LOG}
|
|
||||||
chown "$USER":pihole ${DEBUG_LOG}
|
|
||||||
|
|
||||||
source ${VARSFILE}
|
source ${VARSFILE}
|
||||||
|
|
||||||
### Private functions exist here ###
|
### Private functions exist here ###
|
||||||
log_write() {
|
log_write() {
|
||||||
printf "%b" "${@}" >&3
|
echo "${@}" >&3
|
||||||
}
|
}
|
||||||
|
|
||||||
log_echo() {
|
log_echo() {
|
||||||
|
@ -363,9 +358,9 @@ testChaos(){
|
||||||
|
|
||||||
log_write "Pi-hole dnsmasq specific records lookups"
|
log_write "Pi-hole dnsmasq specific records lookups"
|
||||||
log_write "Cache Size:"
|
log_write "Cache Size:"
|
||||||
dig +short chaos txt cachesize.bind >> ${DEBUG_LOG}
|
log_write $(dig +short chaos txt cachesize.bind)
|
||||||
log_write "Upstream Servers:"
|
log_write "Upstream Servers:"
|
||||||
dig +short chaos txt servers.bind >> ${DEBUG_LOG}
|
log_write $(dig +short chaos txt servers.bind)
|
||||||
log_write ""
|
log_write ""
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -378,7 +373,7 @@ checkProcesses() {
|
||||||
log_write ""
|
log_write ""
|
||||||
log_write "${i}"
|
log_write "${i}"
|
||||||
log_write " processes status:"
|
log_write " processes status:"
|
||||||
systemctl -l status "${i}" >> "${DEBUG_LOG}"
|
log_write $(systemctl -l status "${i}")
|
||||||
done
|
done
|
||||||
log_write ""
|
log_write ""
|
||||||
}
|
}
|
||||||
|
@ -428,6 +423,14 @@ dumpPiHoleLog() {
|
||||||
finalWork() {
|
finalWork() {
|
||||||
local tricorder
|
local tricorder
|
||||||
echo "::: Finshed debugging!"
|
echo "::: Finshed debugging!"
|
||||||
|
|
||||||
|
# Ensure the file exists, create if not, clear if exists.
|
||||||
|
truncate --size=0 "${DEBUG_LOG}"
|
||||||
|
chmod 644 ${DEBUG_LOG}
|
||||||
|
chown "$USER":pihole ${DEBUG_LOG}
|
||||||
|
# copy working temp file to final log location
|
||||||
|
cp /proc/$$/fd/3 "$DEBUG_LOG"
|
||||||
|
|
||||||
echo "::: The debug log can be uploaded to tricorder.pi-hole.net for sharing with developers only."
|
echo "::: The debug log can be uploaded to tricorder.pi-hole.net for sharing with developers only."
|
||||||
if [[ "${AUTOMATED}" ]]; then
|
if [[ "${AUTOMATED}" ]]; then
|
||||||
echo "::: Debug script running in automated mode, uploading log to tricorder..."
|
echo "::: Debug script running in automated mode, uploading log to tricorder..."
|
||||||
|
|
Loading…
Reference in New Issue