Fix memory monitor (#1268)

* Fix memory monitor * Add node process mem usage
AudiusProject · Mar 1, 2021 · c9c7c25 · c9c7c25
1 parent 2a8d5e7
commit c9c7c25
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/creator-node/src/monitors/memory.js b/creator-node/src/monitors/memory.js
@@ -7,10 +7,17 @@ const getTotalMemory = async () => {
 
 const getUsedMemory = async () => {
   const mem = await si.mem()
-  return mem.used
+  // Excluding buffers/cache
+  return mem.active
+}
+
+const getNodeProcessMemoryUsage = async () => {
+  const mem = process.memoryUsage()
+  return JSON.stringify(mem)
 }
 
 module.exports = {
   getTotalMemory,
-  getUsedMemory
+  getUsedMemory,
+  getNodeProcessMemoryUsage
 }
diff --git a/creator-node/src/monitors/monitors.js b/creator-node/src/monitors/monitors.js
@@ -1,5 +1,9 @@
 const { getDatabaseSize, getDatabaseConnections, getDatabaseConnectionInfo, getDatabaseLiveness } = require('./database')
-const { getTotalMemory, getUsedMemory } = require('./memory')
+const {
+  getTotalMemory,
+  getUsedMemory,
+  getNodeProcessMemoryUsage
+} = require('./memory')
 const {
   getStoragePathSize,
   getStoragePathUsed,
@@ -61,15 +65,18 @@ const DATABASE_CONNECTION_INFO = {
 const TOTAL_MEMORY = {
   name: 'totalMemory',
   func: getTotalMemory,
-  ttl: 60 * 2,
   type: 'int'
 }
 const USED_MEMORY = {
   name: 'usedMemory',
   func: getUsedMemory,
-  ttl: 60 * 2,
   type: 'int'
 }
+const NODE_PROCESS_MEMORY_USAGE = {
+  name: 'nodeProcessMemoryUsage',
+  func: getNodeProcessMemoryUsage,
+  type: 'json'
+}
 
 const STORAGE_PATH_SIZE = {
   name: 'storagePathSize',
@@ -152,6 +159,7 @@ const MONITORS = {
   DATABASE_CONNECTION_INFO,
   TOTAL_MEMORY,
   USED_MEMORY,
+  NODE_PROCESS_MEMORY_USAGE,
   STORAGE_PATH_SIZE,
   STORAGE_PATH_USED,
   FILESYSTEM_SIZE,