From db2b537317b35795380f1d0d8390b6314e162a21 Mon Sep 17 00:00:00 2001
From: Hemna <waboring@hemna.com>
Date: Fri, 29 Jan 2021 11:02:21 -0500
Subject: [PATCH] Added memory tracing in keeplive

---
 aprsd/email.py   | 4 ++++
 aprsd/main.py    | 3 ---
 aprsd/threads.py | 7 ++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/aprsd/email.py b/aprsd/email.py
index da5065c..9364c6b 100644
--- a/aprsd/email.py
+++ b/aprsd/email.py
@@ -51,6 +51,9 @@ def _imap_connect():
     server.select_folder("INBOX")
 
     server.fetch = trace.trace(server.fetch)
+    server.search = trace.trace(server.search)
+    server.remove_flags = trace.trace(server.remove_flags)
+    server.add_flags = trace.trace(server.add_flags)
     return server
 
 
@@ -89,6 +92,7 @@ def _smtp_connect():
     debug = CONFIG["aprsd"]["email"]["smtp"].get("debug", False)
     if debug:
         server.set_debuglevel(5)
+        server.sendmail = trace.trace(server.sendmail)
 
     try:
         server.login(
diff --git a/aprsd/main.py b/aprsd/main.py
index dfe2572..d0b621e 100644
--- a/aprsd/main.py
+++ b/aprsd/main.py
@@ -425,10 +425,7 @@ def server(
 
     setup_logging(config, loglevel, quiet)
     if config["aprsd"].get("trace", False):
-        click.echo("PISS")
         trace.setup_tracing(["method", "api"])
-    else:
-        click.echo("NO PISS")
     LOG.info("APRSD Started version: {}".format(aprsd.__version__))
     stats.APRSDStats(config)
 
diff --git a/aprsd/threads.py b/aprsd/threads.py
index c1882b2..736a052 100644
--- a/aprsd/threads.py
+++ b/aprsd/threads.py
@@ -4,6 +4,7 @@ import logging
 import queue
 import threading
 import time
+import tracemalloc
 
 from aprsd import client, messaging, plugin, stats, trace
 import aprslib
@@ -69,6 +70,7 @@ class KeepAliveThread(APRSDThread):
 
     def __init__(self):
         super().__init__("KeepAlive")
+        tracemalloc.start()
 
     def loop(self):
         if self.cntr % 6 == 0:
@@ -81,14 +83,17 @@ class KeepAliveThread(APRSDThread):
             else:
                 email_thread_time = "N/A"
 
+            current, peak = tracemalloc.get_traced_memory()
             LOG.debug(
                 "Uptime ({}) Tracker({}) "
-                "Msgs: TX:{} RX:{} EmailThread: {}".format(
+                "Msgs: TX:{} RX:{} EmailThread: {} RAM: Current:{} Peak:{}".format(
                     stats_obj.uptime,
                     len(tracker),
                     stats_obj.msgs_tx,
                     stats_obj.msgs_rx,
                     email_thread_time,
+                    current,
+                    peak,
                 ),
             )
         self.cntr += 1