From de6cb59e943e285cc1cc3c8c298316ac0147a9b0 Mon Sep 17 00:00:00 2001
From: Ubergeek <ubergeek@yourtilde.com>
Date: Sun, 26 Jan 2020 21:45:29 -0500
Subject: [PATCH] Finished memory endpoint

---
 README.md           | 15 ++++++++++++++-
 endpoints/memory.py |  9 ++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 69fb5dc..349dd2e 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ This endpoint shall return a json struct containing interfaces, and IP addresses
 
 ### uptime
 
-This will return a struct of system uptime:
+This will return a JSON payload of system uptime:
 
 ```
 {
@@ -68,6 +68,19 @@ This will return a struct of system uptime:
 }
 ```
 
+### mem
+
+This will return a JSON payload containing information about the system memory, in bytes:
+
+```
+{
+   "free" : 8668672000,
+   "total" : 33638055936,
+   "percent" : 74.2,
+   "used" : 22686449664
+}
+```
+
 ### teapot
 
 This shall return a struct, describing the current tea making capabilities of the system:
diff --git a/endpoints/memory.py b/endpoints/memory.py
index 3b00d7c..b88fcdf 100644
--- a/endpoints/memory.py
+++ b/endpoints/memory.py
@@ -5,4 +5,11 @@ class Memory(Resource):
     def get(self):
         vmem_usage = psutil.virtual_memory()
         smem_usage = psutil.swap_memory()
-        abort(501, message="Not currently implemented.")
+        json_payload={
+          "total":vmem_usage.total,
+          "free":vmem_usage.free,
+          "used":vmem_usage.used,
+          "percent":vmem_usage.percent
+        }
+        #abort(501, message="Not currently implemented.")
+        return json_payload