From 5abcc1d2843300e00b923ee1b5013a7b95a62718 Mon Sep 17 00:00:00 2001
From: "Rob Swindell (on ChromeOS)" <rob@synchro.net>
Date: Sat, 18 Feb 2023 15:37:29 -0800
Subject: [PATCH] file_area.min_diskspace is in bytes now, not kilobytes - so
deal
Also, use easier to read byte value strings in email and log msgs.
---
exec/chkspace.js | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/exec/chkspace.js b/exec/chkspace.js
index e920bc503e..8ee33f526b 100644
--- a/exec/chkspace.js
+++ b/exec/chkspace.js
@@ -7,6 +7,7 @@
// Example: "?chkspace [dir1] [dir2] [minfreespace]"
load("sbbsdefs.js");
+load("file_size.js");
var minspace = file_area.min_diskspace*2; // default to twice the min allowed for uploads
var dirs = new Array();
@@ -23,10 +24,11 @@ if(!dirs.length)
var msgbase;
for(i in dirs) {
- var freespace = dir_freespace(dirs[i],1024);
+ var freespace = dir_freespace(dirs[i]);
- if(freespace==-1 || freespace >= minspace)
+ if(freespace >= minspace) {
continue; // everything's fine
+ }
if(!msgbase) {
msgbase = new MsgBase("mail");
@@ -35,11 +37,11 @@ for(i in dirs) {
exit();
}
}
- log(LOG_WARNING,"!Low disk space: " + freespace + " kilobytes on " + dirs[i]);
+ log(LOG_WARNING,"!Low disk space: " + file_size_str(freespace, 1, 1) + " bytes on " + dirs[i]);
hdr = { to: 'sysop', to_ext: '1', from: 'chkspace', subject: 'Low disk space notification' }
- if(!msgbase.save_msg(hdr, "WARNING: Only " + freespace + " kilobytes of free disk space in "
+ if(!msgbase.save_msg(hdr, "WARNING: Only " + file_size_str(freespace, 1, 1) + " bytes of free disk space in "
+ dirs[i] + " on " + system.timestr()))
log(LOG_ERR,"!Error " + msgbase.last_error + "saving mail message");
--
GitLab