jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

df can hang

Browse Source
This commit is contained in:
Girish Ramakrishnan
2024-02-21 12:47:30 +01:00
parent c1bb4de6a3
commit fa3e908afc
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/cloudron-support
+3 -1
View File
@@ -125,7 +125,9 @@ function send_diagnostics() {
fi
echo -e $LINE"Filesystem stats"$LINE >> $log
df -h &>> $log
if ! timeout --kill-after 10s 15s df -h &>> $log 2>&1; then
echo -e "df is not responding" >> $log
fi
echo -e $LINE"Appsdata stats"$LINE >> $log
du -hcsL /home/yellowtent/appsdata/* &>> $log || true
src/df.js
+2 -2
View File
@@ -37,7 +37,7 @@ function parseLine(line) {
}
async function disks() {
const [error, output] = await safe(shell.promises.exec('disks', 'df -B1 --output=source,fstype,size,used,avail,pcent,target', {}));
const [error, output] = await safe(shell.promises.exec('disks', 'df -B1 --output=source,fstype,size,used,avail,pcent,target', { timeout: 5000 }));
if (error) {
debug(`disks: df command failed. error: ${error}\n stdout: ${error.stdout}\n stderr: ${error.stderr}`);
throw new BoxError(BoxError.FS_ERROR, `Error running df: ${error.message}`);
@@ -54,7 +54,7 @@ async function disks() {
async function file(filename) {
assert.strictEqual(typeof filename, 'string');
const [error, output] = await safe(shell.promises.exec('file', `df -B1 --output=source,fstype,size,used,avail,pcent,target ${filename}`, {}));
const [error, output] = await safe(shell.promises.exec('file', `df -B1 --output=source,fstype,size,used,avail,pcent,target ${filename}`, { timeout: 5000 }));
if (error) {
debug(`file: df command failed. error: ${error}\n stdout: ${error.stdout}\n stderr: ${error.stderr}`);
throw new BoxError(BoxError.FS_ERROR, `Error running df: ${error.message}`);