Add dockerDataDisk to disks response

src/cloudron.js

@@ -6,7 +6,6 @@ exports = module.exports = {
     initialize: initialize,
     uninitialize: uninitialize,
     getConfig: getConfig,
-    getDisks: getDisks,
     getLogs: getLogs,
 
     reboot: reboot,
@@ -22,9 +21,6 @@ exports = module.exports = {
     setupDashboard: setupDashboard,
 
     runSystemChecks: runSystemChecks,
-
-    // exposed for testing
-    _checkDiskSpace: checkDiskSpace
 };
 
 var apps = require('./apps.js'),
@@ -38,7 +34,6 @@ var apps = require('./apps.js'),
     debug = require('debug')('box:cloudron'),
     domains = require('./domains.js'),
     DomainsError = require('./domains.js').DomainsError,
-    df = require('@sindresorhus/df'),
     eventlog = require('./eventlog.js'),
     custom = require('./custom.js'),
     fs = require('fs'),
@@ -166,53 +161,6 @@ function runStartupTasks() {
     });
 }
 
-function getDisks(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    const dfAsync = async.asyncify(df), dfFileAsync = async.asyncify(df.file);
-
-    async.series([
-        dfAsync,
-        dfFileAsync.bind(null, paths.BOX_DATA_DIR),
-        dfFileAsync.bind(null, paths.PLATFORM_DATA_DIR),
-        dfFileAsync.bind(null, paths.APPS_DATA_DIR),
-    ], function (error, values) {
-        if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
-
-        // filter by ext4 and then sort to make sure root disk is first
-        const ext4Disks = values[0].filter((r) => r.type === 'ext4').sort((a, b) => a.mountpoint.localeCompare(b.mountpoint));
-
-        const disks = {
-            disks: ext4Disks, // root disk is first
-            boxDataDisk: values[1].filesystem,
-            mailDataDisk: values[1].filesystem,
-            platformDataDisk: values[2].filesystem,
-            appsDataDisk: values[3].filesystem,
-            apps: {}
-        };
-
-        apps.getAll(function (error, allApps) {
-            if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
-
-            async.eachSeries(allApps, function (app, iteratorDone) {
-                if (!app.dataDir) {
-                    disks.apps[app.id] = disks.appsDataDisk;
-                    return iteratorDone();
-                }
-
-                dfFileAsync(app.dataDir, function (error, result) {
-                    disks.apps[app.id] = error ? disks.appsDataDisk : result.filesystem; // ignore any errors
-                    iteratorDone();
-                });
-            }, function (error) {
-                if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
-
-                callback(null, disks);
-            });
-        });
-    });
-}
-
 function getConfig(callback) {
     assert.strictEqual(typeof callback, 'function');
 
@@ -251,7 +199,6 @@ function isRebootRequired(callback) {
 function runSystemChecks() {
     async.parallel([
         checkBackupConfiguration,
-        checkDiskSpace,
         checkMailStatus,
         checkRebootRequired
     ], function (error) {
@@ -271,30 +218,6 @@ function checkBackupConfiguration(callback) {
     });
 }
 
-function checkDiskSpace(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    debug('Checking disk space');
-
-    getDisks(function (error, disks) {
-        if (error) {
-            debug('checkDiskSpace: error getting disks %s', error.message);
-            return callback();
-        }
-
-        var oos = disks.disks.some(function (entry) {
-            // ignore other filesystems but where box, app and platform data is
-            if (entry.filesystem !== disks.boxDataDisk && entry.filesystem !== disks.platformDataDisk && entry.filesystem !== disks.appsDataDisk) return false;
-
-            return (entry.available <= (1.25 * 1024 * 1024 * 1024)); // 1.5G
-        });
-
-        debug('checkDiskSpace: disk space checked. ok: %s', !oos);
-
-        notifications.alert(notifications.ALERT_DISK_SPACE, 'Server is running out of disk space', oos ? JSON.stringify(disks.disks, null, 4) : '', callback);
-    });
-}
-
 function checkMailStatus(callback) {
     assert.strictEqual(typeof callback, 'function');