Calculate vmail on disk usage

tbaldur · Aug 11, 2022 · 61ecb21 · 61ecb21
1 parent 2c28415
commit 61ecb21
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/plogical/IncScheduler.py b/plogical/IncScheduler.py
@@ -888,8 +888,7 @@ def CalculateAndUpdateDiskUsage():
                         email.save()
                         print('Disk Usage of %s is %s' % (email.email, email.DiskUsage))
 
-                config['DiskUsage'], config['DiskUsagePercentage'] = virtualHostUtilities.getDiskUsage(
-                    "/home/" + website.domain, website.package.diskSpace)
+                config['DiskUsage'], config['DiskUsagePercentage'] = virtualHostUtilities.getDiskUsage(website.domain, website.package.diskSpace)
 
                 if website.package.enforceDiskLimits:
                     if config['DiskUsagePercentage'] >= 100:

diff --git a/plogical/virtualHostUtilities.py b/plogical/virtualHostUtilities.py
@@ -1181,7 +1181,12 @@ def switchServer(virtualHostName, phpVersion, server, tempStatusPath):
     def getDiskUsage(path, totalAllowed):
         try:
 
-            totalUsageInMB = subprocess.check_output('du -hs %s --block-size=1M' % (path), shell=True).decode("utf-8").split()[0]
+            totalUsageInMB = subprocess.check_output('du -hs /home/%s --block-size=1M' % (path), shell=True).decode("utf-8").split()[0]
+
+            # Calculate vmail folder size and add it to usage
+            totalUsageEmailInMB = subprocess.check_output('du -hs /home/vmail/%s --block-size=1M' % (path), shell=True).decode("utf-8").split()[0]
+
+            totalUsageInMB = int(totalUsageEmailInMB) + int(totalUsageInMB)
 
             percentage = float(100) / float(totalAllowed)