wgester/dotfiles
1
0
Fork 0
forked from colonelpanic/dotfiles
Code Pull Requests Activity

[NixOS] A few more logging nvidia-container-toolkit tweaks

Browse Source
This commit is contained in:
Ivan Malison
2024-12-30 18:20:46 -07:00
parent 8fd220c919
commit a895c2471d
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
nixos/overlay.nix
View File

@@ -32,7 +32,7 @@ final: prev:
fi fi
# --- STARTUP LOG --- # --- STARTUP LOG ---
echo "\$(date '+%Y-%m-%d %H:%M:%S') - NVIDIA Container Toolkit (main) started" \ echo "\$(date '+%Y-%m-%d %H:%M:%S') - $exe started" \
>> /var/log/nvidia-container-toolkit/$exe.startup.log 2>/dev/null || true >> /var/log/nvidia-container-toolkit/$exe.startup.log 2>/dev/null || true
# --- COMMAND INVOCATION LOG --- # --- COMMAND INVOCATION LOG ---
@@ -49,6 +49,8 @@ final: prev:
# --- FINISHED LOG --- # --- FINISHED LOG ---
echo "\$(date '+%Y-%m-%d %H:%M:%S') - Finished $exe with exit code: \$exit_code" >> \ echo "\$(date '+%Y-%m-%d %H:%M:%S') - Finished $exe with exit code: \$exit_code" >> \
/var/log/nvidia-container-toolkit/$exe.log 2>/dev/null || true /var/log/nvidia-container-toolkit/$exe.log 2>/dev/null || true
echo "\$(date '+%Y-%m-%d %H:%M:%S') - $exe finished" \
>> /var/log/nvidia-container-toolkit/$exe.startup.log 2>/dev/null || true
EOF EOF
chmod +x wrapper-out/$exe chmod +x wrapper-out/$exe
done done
@@ -61,17 +63,32 @@ final: prev:
cat > wrapper-tools/$exe <<EOF cat > wrapper-tools/$exe <<EOF
#!${final.bash}/bin/bash #!${final.bash}/bin/bash
if [ "\$(id -u)" -eq 0 ]; then
mkdir -p /var/log/nvidia-container-toolkit
chown root:users /var/log/nvidia-container-toolkit
chmod 2777 /var/log/nvidia-container-toolkit
fi
# --- STARTUP LOG --- # --- STARTUP LOG ---
echo "\$(date '+%Y-%m-%d %H:%M:%S') - NVIDIA Container Toolkit (tools) started" \ echo "\$(date '+%Y-%m-%d %H:%M:%S') - $exe started" \
>> /var/log/nvidia-container-toolkit/startup.log 2>/dev/null || true >> /var/log/nvidia-container-toolkit/$exe.startup.log 2>/dev/null || true
# --- COMMAND INVOCATION LOG --- # --- COMMAND INVOCATION LOG ---
echo "\$(date '+%Y-%m-%d %H:%M:%S') - Executing $exe with args: \$@" \ echo "\$(date '+%Y-%m-%d %H:%M:%S') - Executing $exe with args: \$@" \
>> /var/log/nvidia-container-toolkit/tools.log 2>/dev/null || true >> /var/log/nvidia-container-toolkit/$exe.log 2>/dev/null || true
# --- Run the real tool, piping stdout+stderr to tee --- # --- Run the real tool, piping stdout+stderr to tee ---
exec ${prev.nvidia-container-toolkit.tools}/bin/$exe "\$@" 2>&1 | \ ${prev.nvidia-container-toolkit.tools}/bin/$exe "\$@" > \
tee -a /var/log/nvidia-container-toolkit/tools.log >(tee -a /var/log/nvidia-container-toolkit/$exe.stdout.log) \
2> >(tee -a /var/log/nvidia-container-toolkit/$exe.stderr.log >&2)
exit_code=\$?
# --- FINISHED LOG ---
echo "\$(date '+%Y-%m-%d %H:%M:%S') - Finished $exe with exit code: \$exit_code" >> \
/var/log/nvidia-container-toolkit/$exe.log 2>/dev/null || true
echo "\$(date '+%Y-%m-%d %H:%M:%S') - $exe finished" \
>> /var/log/nvidia-container-toolkit/$exe.startup.log 2>/dev/null || true
EOF EOF
chmod +x wrapper-tools/$exe chmod +x wrapper-tools/$exe
done done