From 34fca58084a32df72a86083f2ff78d6a1baae81f Mon Sep 17 00:00:00 2001
From: Anthony Leung <leunga1000@yahoo.com>
Date: Tue, 25 Jun 2024 10:17:16 +0000
Subject: [PATCH] auto reload functionality

---
 src/socketify/loop.py      | 60 ++++++++++++++++++++++++++++++++++----
 src/socketify/socketify.py |  9 ++----
 2 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/src/socketify/loop.py b/src/socketify/loop.py
index 074d577..3897111 100644
--- a/src/socketify/loop.py
+++ b/src/socketify/loop.py
@@ -1,5 +1,7 @@
 import asyncio
 import logging
+from time import sleep
+import threading
 from .tasks import create_task, TaskFactory
 from .uv import UVLoop
 
@@ -76,8 +78,45 @@ class Loop:
     def create_future(self):
         return self.loop.create_future()
 
+    def run_uv(self, uv_loop):
+        print('run uv', flush=True)
+        uv_loop.run()
+        #import time
+        #while True:
+        #    time.sleep(1)
+        #    uv_loop.run_nowait()
+
+    def start_uvloop(self):
+        '''
+        import time
+        if not self.started:
+            time.sleep(1)
+            self._keep_alive()
+        '''
+
+        if not hasattr(self, 'thread_started'):
+            logging.info('starting _keep_alive thread')
+            t1 = threading.Thread(target=self.run_uv, daemon=True, args=[self.uv_loop])
+            t1.start()
+        self.thread_started = True
+
     def _keep_alive(self):
+        '''if not self.started:
+            time.sleep(1)
+            self._keep_alive()
+        '''
+        '''
+        if not hasattr(self, 'thread_started'):
+            logging.info('starting _keep_alive thread')
+            t1 = threading.Thread(target=self.run_uv, daemon=True, args=[self.uv_loop])
+            t1.start()
+        '''
+        self.thread_started = True
         if self.started:
+            #sleep(5)  # TODO does this still run?
+            #asyncio.sleep(5)
+            logging.info('Commencing self.started loop checking ')
+            print('in _k_a')
             relax = False
             if not self.is_idle:
                 self._idle_count = 0
@@ -85,17 +124,20 @@ class Loop:
                 self._idle_count += 1
             else:
                 relax = True
-            
+            #print(self._idle_count, relax)
+
             self.is_idle = True
-                
+
             if relax:
-                self.uv_loop.run_nowait()
+                #self.uv_loop.run()
+                #self.uv_loop.run_nowait()
+                #self.loop.call_later(10, self._keep_alive)
                 self.loop.call_later(0.001, self._keep_alive)
             else:
-                self.uv_loop.run_nowait()
+                #self.uv_loop.run_nowait()
                 # be more agressive when needed
                 self.loop.call_soon(self._keep_alive)
-                
+
     def create_task(self, *args, **kwargs):
         # this is not using optimized create_task yet
         return self.loop.create_task(*args, **kwargs)
@@ -109,6 +151,10 @@ class Loop:
             future = self.ensure_future(task)
         else:
             future = None
+        print('RUC', flush=True)
+        # not sure if this method is used. if so,
+        # might want to use self.start_uvloop() here
+        # as well?
         self.loop.call_soon(self._keep_alive)
         self.loop.run_until_complete(future)
         # clean up uvloop
@@ -121,7 +167,9 @@ class Loop:
             future = self.ensure_future(task)
         else:
             future = None
-        self.loop.call_soon(self._keep_alive)
+        print('RUN', flush=True)
+        self.start_uvloop()
+        #self.loop.call_soon(self._keep_alive)
         self.loop.run_forever()
         # clean up uvloop
         self.uv_loop.stop()
diff --git a/src/socketify/socketify.py b/src/socketify/socketify.py
index 7a9ead6..71770b4 100644
--- a/src/socketify/socketify.py
+++ b/src/socketify/socketify.py
@@ -1558,9 +1558,7 @@ class AppResponse:
         return self.app.loop.run_async(task, self)
 
     async def get_form_urlencoded(self, encoding="utf-8"):
-        print('getf u')
         data = await self.get_data()
-        print('got')
         try:
             # decode and unquote all
             result = {}
@@ -3382,14 +3380,11 @@ class App:
         signal.signal(signal.SIGINT, signal_handler)
         
         def reload_signal_handler(sig, frame):
-            print('caught sigterm')
+            """ This signal handler captures a sigterm from cli.py which is a 
+            request to reload the process """
             self.close()
-            print('closed, raising sysexit')
             raise SystemExit('reload')
         
-        #from .cli import RELOAD_SIGNAL # SIGUSR1 SIG_CTRL_BREAK
-        #print(RELOAD_SIGNAL)
-        #print(signal.NSIG)
         signal.signal(signal.SIGTERM, reload_signal_handler)  # used by --reload in cli.py to reload process
 
         self.loop.run()