Browse Source

Add more disk space info

tags/nilmdb-1.6.2
Jim Paris 11 years ago
parent
commit
539c92226c
3 changed files with 15 additions and 6 deletions
  1. +5
    -2
      nilmdb/cmdline/info.py
  2. +6
    -2
      nilmdb/server/server.py
  3. +4
    -2
      tests/test_cmdline.py

+ 5
- 2
nilmdb/cmdline/info.py View File

@@ -21,5 +21,8 @@ def cmd_info(self):
printf("Server URL: %s\n", self.client.geturl())
dbinfo = self.client.dbinfo()
printf("Server database path: %s\n", dbinfo["path"])
printf("Server database size: %s\n", human_size(dbinfo["size"]))
printf("Server database free space: %s\n", human_size(dbinfo["free"]))
for (desc, field) in [("used by NilmDB", "size"),
("used by other", "other"),
("reserved", "reserved"),
("free", "free")]:
printf("Server disk space %s: %s\n", desc, human_size(dbinfo[field]))

+ 6
- 2
nilmdb/server/server.py View File

@@ -167,9 +167,13 @@ class Root(NilmApp):
"""Return a dictionary with the database path,
size of the database in bytes, and free disk space in bytes"""
path = self.db.get_basepath()
usage = psutil.disk_usage(path)
dbsize = nilmdb.utils.du(path)
return { "path": path,
"size": nilmdb.utils.du(path),
"free": psutil.disk_usage(path).free }
"size": dbsize,
"other": usage.used - dbsize,
"reserved": usage.total - usage.used - usage.free,
"free": usage.free }

class Stream(NilmApp):
"""Stream-specific operations"""


+ 4
- 2
tests/test_cmdline.py View File

@@ -245,8 +245,10 @@ class TestCmdline(object):
self.contain("Client version: " + nilmdb.__version__)
self.contain("Server version: " + test_server.version)
self.contain("Server database path")
self.contain("Server database size")
self.contain("Server database free space")
self.contain("Server disk space used by NilmDB")
self.contain("Server disk space used by other")
self.contain("Server disk space reserved")
self.contain("Server disk space free")

def test_04_createlist(self):
# Basic stream tests, like those in test_client.


Loading…
Cancel
Save