@@ -38,6 +38,8 @@

 #     status page and parsed the signal data from the html.

 #   * v23 released 11 Jun 2021 by J L Owrey; remove unused code.

 #   * v24 released 14 Jun 2021 by J L Owrey; minor revisions

+#   * v25 released 9 Jul 2021 by J L Owrey; improved handling of

+#         node status function

 #

 #2345678901234567890123456789012345678901234567890123456789012345678901234567890

@@ -59,7 +61,8 @@ _SERVER_MODE = "primary"

 # set url of the aredn node

-_DEFAULT_AREDN_NODE_URL = "{your AREDN mesh node url"

+_DEFAULT_AREDN_NODE_URL = \

+    "{your node url}"

     ### FILE AND FOLDER LOCATIONS ###

@@ -101,7 +104,7 @@ debugMode = False

 # count of failed attempts to get data from aredn node

 failedUpdateCount = 0

 # detected status of aredn node device

-nodeOnline = True

+nodeOnline = False

 # ip address of aredn node

 arednNodeUrl = _DEFAULT_AREDN_NODE_URL

@@ -165,10 +168,8 @@ def terminateAgentProcess(signal, frame):

            signal, frame - dummy parameters

        Returns: nothing

     """

-    # Inform downstream clients by removing output data file.

-    if os.path.exists(_OUTPUT_DATA_FILE):

-       os.remove(_OUTPUT_DATA_FILE)

     print('%s terminating arednsig agent process' % getTimeStamp())

+    setStatusToOffline()

     sys.exit(0)

 ##end def

@@ -183,12 +184,8 @@ def getNodeData(dData):

     """

     try:

         currentTime = time.time()

-

         response = urlopen(arednNodeUrl, timeout=_HTTP_REQUEST_TIMEOUT)

-

-        if verboseMode:

-            requestTime = time.time() - currentTime

-            print("http request: %.4f seconds" % requestTime)

+        requestTime = time.time() - currentTime

         content = response.read().decode('utf-8')

         content = content.replace('\n', '')

@@ -206,9 +203,10 @@ def getNodeData(dData):

     if debugMode:

         print(content)

+    if verboseMode:

+        print("http request successful: %.4f sec" % requestTime)

     dData['content'] = content

-

     return True

 ##end def

@@ -237,14 +235,19 @@ def parseDataString(dData):

         snr = snr.replace(' ','')

         lsnr = snr.split('/')

-        dData['time'] = getEpochSeconds(getTimeStamp())

         dData['signal'] = lsnr[0]

         dData['noise'] = lsnr[1]

         dData['snr'] = lsnr[2]

-    

     except Exception as exError:

         print("%s parse failed: %s" % (getTimeStamp(), exError))

         return False

+    ## end try

+

+    # Add status information to dictionary object.

+    dData['date'] = getTimeStamp()

+    dData['chartUpdateInterval'] = chartUpdateInterval

+    dData['dataRequestInterval'] = dataRequestInterval

+    dData['serverMode'] = _SERVER_MODE

     return True

 ##end def

@@ -262,16 +265,12 @@ def writeOutputFile(dData):