From 6e35f9b0dd10b7af8aaa2144aaccdfc2916217ff Mon Sep 17 00:00:00 2001
From: Marat Fayzullin <luarvique@gmail.com>
Date: Mon, 3 Jul 2023 18:07:37 -0400
Subject: [PATCH] Instead of ignoring startup failure, going to retry a few
 times, then fail.

---
 owrx/sdr.py             |  4 +---
 owrx/source/__init__.py | 38 ++++++++++++++++++++++++++++++++------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/owrx/sdr.py b/owrx/sdr.py
index 79b216a2..4ba7059c 100644
--- a/owrx/sdr.py
+++ b/owrx/sdr.py
@@ -130,9 +130,7 @@ class ActiveSdrSources(PropertyReadOnly):
                 self._addSource(key, value)
 
     def isAvailable(self, source: SdrSource):
-# @@@
-#        return source.isEnabled() and not source.isFailed()
-        return source.isEnabled()
+        return source.isEnabled() and not source.isFailed()
 
     def _addSource(self, key, source: SdrSource):
         if self.isAvailable(source):
diff --git a/owrx/source/__init__.py b/owrx/source/__init__.py
index 69e9620c..dd566fbf 100644
--- a/owrx/source/__init__.py
+++ b/owrx/source/__init__.py
@@ -168,6 +168,8 @@ class SdrSource(ABC):
         props.filter("enabled").wire(self._handleEnableChanged)
         self.failed = False
         self.busyState = SdrBusyState.IDLE
+        self.restartTimer = None
+        self.startRetries = 0
 
         self.validateProfiles()
 
@@ -285,6 +287,16 @@ class SdrSource(ABC):
                 self.tcpSource = TcpSource(self.port, self._getTcpSourceFormat())
         return self.tcpSource
 
+    def _cancelRestart(self):
+        if self.restartTimer:
+            self.restartTimer.cancel()
+            self.restartTimer = None
+
+    def _scheduleRestart(self):
+        self._cancelRestart()
+        self.restartTimer = threading.Timer(60, self.start)
+        self.restartTimer.start()
+
     def getBuffer(self):
         if self.buffer is None:
             self.buffer = Buffer(Format.COMPLEX_FLOAT)
@@ -301,12 +313,14 @@ class SdrSource(ABC):
 
     def start(self):
         with self.modificationLock:
+            # make sure we do not restart twice
+            self._cancelRestart()
+
             if self.monitor:
                 return
 
-# @@@
-#            if self.isFailed():
-#                return
+            if self.isFailed():
+                return
 
             try:
                 self.preStart()
@@ -339,10 +353,12 @@ class SdrSource(ABC):
                 self.process = None
                 self.monitor = None
                 if self.getState() is SdrSourceState.RUNNING:
+                    # @@@ TODO: get back to this and figure out what to do!
                     self.fail()
                 else:
                     failed = True
                 self.setState(SdrSourceState.STOPPED)
+                self.startRetries = 0
 
             self.monitor = threading.Thread(target=wait_for_process_to_end, name="source_monitor")
             self.monitor.start()
@@ -371,10 +387,17 @@ class SdrSource(ABC):
                 logger.exception("Exception during postStart()")
                 failed = True
 
-        if failed:
-            self.fail()
-        else:
+        if not failed:
+            # startup succeeded
             self.setState(SdrSourceState.RUNNING)
+            self.startRetries = 0
+        elif self.startRetries < 10:
+            # startup failed, retry in a minute
+            self.startRetries = self.startRetries + 1
+            self._scheduleRestart()
+        else:
+            # startup repeatedly failed, consider device failed
+            self.fail()
 
     def preStart(self):
         """
@@ -396,6 +419,9 @@ class SdrSource(ABC):
 
     def stop(self):
         with self.modificationLock:
+            # make sure we do not restart after stop
+            self._cancelRestart()
+
             if self.process is not None:
                 self.setState(SdrSourceState.STOPPING)
                 try: