@@ -11,7 +11,7 @@

 #     - conversion of data items

 #     - update a round robin (rrdtool) database with the radiation data

 #     - periodically generate graphic charts for display in html documents

-#     - write the processed weather data to a JSON file for use by html

+#     - write the processed radmon data to a JSON file for use by html

 #       documents

 #

 # Copyright 2015 Jeff Owrey

@@ -35,6 +35,7 @@

 #         improved radmon device offline status handling

 #   * v23 released 16 Nov 2018 by J L Owrey: improved fault handling

 #         and data conversion

+#2345678901234567890123456789012345678901234567890123456789012345678901234567890

 import os

 import urllib2

@@ -50,7 +51,7 @@ _USER = os.environ['USER']

    ### DEFAULT RADIATION MONITOR URL ###

 # ip address of radiation monitoring device

-_DEFAULT_RADIATION_MONITOR_URL = "{your radiation monitor url}"

+_DEFAULT_RADIATION_MONITOR_URL = "http://192.168.1.24"

     ### FILE AND FOLDER LOCATIONS ###

@@ -58,11 +59,9 @@ _DEFAULT_RADIATION_MONITOR_URL = "{your radiation monitor url}"

 _DOCROOT_PATH = "/home/%s/public_html/radmon/" % _USER

 # folder for charts and output data file

 _CHARTS_DIRECTORY = _DOCROOT_PATH + "dynamic/"

-# location of data input file

-_INPUT_DATA_FILE = _DOCROOT_PATH + "dynamic/radmonInputData.dat"

 # location of data output file

 _OUTPUT_DATA_FILE = _DOCROOT_PATH + "dynamic/radmonOutputData.js"

-# database that stores weather data

+# database that stores radmon data

 _RRD_FILE = "/home/%s/database/radmonData.rrd" % _USER

     ### GLOBAL CONSTANTS ###

@@ -81,6 +80,8 @@ _HTTP_REQUEST_TIMEOUT = 3

 _CHART_WIDTH = 600

 # standard chart height in pixels

 _CHART_HEIGHT = 150

+# source of time stamp attached to output data file

+_USE_RADMON_TIMESTAMP = True

    ### GLOBAL VARIABLES ###

@@ -123,13 +124,9 @@ def setStatusToOffline():

     """

     global stationOnline

-    # Inform downstream clients by removing input and output

-    # data files.

-    if os.path.exists(_INPUT_DATA_FILE):

-        os.remove(_INPUT_DATA_FILE)

+    # Inform downstream clients by removing output data file.

     if os.path.exists(_OUTPUT_DATA_FILE):

        os.remove(_OUTPUT_DATA_FILE)

-

     # If the radiation monitor was previously online, then send

     # a message that we are now offline.

     if stationOnline:

@@ -145,15 +142,11 @@ 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 radmon agent process' % \

               (getTimeStamp())

-

-    # Inform downstream clients by removing input and output

-    # data files.

-    if os.path.exists(_OUTPUT_DATA_FILE):

-        os.remove(_OUTPUT_DATA_FILE)

-    if os.path.exists(_INPUT_DATA_FILE):

-        os.remove(_INPUT_DATA_FILE)

     sys.exit(0)

 ##end def

@@ -232,18 +225,19 @@ def convertData(dData):

        Returns: True if successful, False otherwise

     """

     try:

-        # Convert the UTC timestamp provided by the radiation monitoring

-        # device to epoch local time in seconds.

-        ts_utc = time.strptime(dData['UTC'], "%H:%M:%S %m/%d/%Y")

-        epoch_local_sec = calendar.timegm(ts_utc)

-        dData['ELT'] = epoch_local_sec

-

-        # Uncomment the code line below to use a timestamp generated by the

-        # requesting server (this) instead of the timestamp provided by the

-        # radiation monitoring device.  Using the server generated timestamp

-        # prevents errors that occur when the radiation monitoring device

-        # fails to synchronize with a valid NTP time server.

-        #dData['ELT'] = time.time()

+        if _USE_RADMON_TIMESTAMP:

+            # Convert the UTC timestamp provided by the radiation monitoring

+            # device to epoch local time in seconds.

+            ts_utc = time.strptime(dData['UTC'], "%H:%M:%S %m/%d/%Y")

+            epoch_local_sec = calendar.timegm(ts_utc)

+            dData['ELT'] = epoch_local_sec

+        else:

+            # Use a timestamp generated by the requesting server (this)

+            # instead of the timestamp provided by the radiation monitoring

+            # device.  Using the server generated timestamp prevents errors

+            # that occur when the radiation monitoring device fails to

+            # synchronize with a valid NTP time server.

+            dData['ELT'] = time.time()

         dData['Mode'] = dData['Mode'].lower()

         dData['uSvPerHr'] = '%.2f' % float(dData.pop('uSv/hr'))

@@ -264,22 +258,22 @@ def writeOutputDataFile(dData):

                    to the output data file

        Returns: True if successful, False otherwise

     """

+    # Create temporary copy of output data items.

+    dTemp = dict(dData)

     # Set date to current time and data

-    dData['date'] = time.strftime("%m/%d/%Y %T", time.localtime(dData['ELT']))

-

+    dTemp['date'] = time.strftime("%m/%d/%Y %T", time.localtime(dData['ELT']))

     # Remove unnecessary data items.

-    dTemp = dict(dData)

     dTemp.pop('ELT')

     dTemp.pop('UTC')

-    

-    # Format the weather data as string using java script object notation.

+

+    # Format the radmon data as string using java script object notation.

     sData = '[{'

     for key in dTemp:

-        sData += '\"%s\":\"%s\",' % (key, dData[key])

+        sData += '\"%s\":\"%s\",' % (key, dTemp[key])

     sData = sData[:-1] + '}]\n'

     if verboseDebug:

-        print sData

+        print sData,

     # Write the string to the output data file for use by html documents.

     try:

@@ -293,26 +287,6 @@ def writeOutputDataFile(dData):

     return True

 ## end def

-def writeInputDataFile(sData):

-    """Write raw data from radiation monitor to the input data file.

-       This file may then be accessed by downstream mirror servers.

-       Parameters:

-           sData - a string object containing the raw data from

-                   the radiation monitor

-       Returns: True if successful, False otherwise

-    """

-    sData += "\n"

-    try:

-        fc = open(_INPUT_DATA_FILE, "w")

-        fc.write(sData)

-        fc.close()

-    except Exception, exError:

-        print "%s writeInputDataFile: %s" % (getTimeStamp(), exError)

-        return False

-

-    return True

-##end def

-

 def setStationStatus(updateSuccess):

     """Detect if radiation monitor is offline or not available on

        the network. After a set number of attempts to get data

@@ -332,13 +306,13 @@ def setStationStatus(updateSuccess):

             print '%s radiation monitor online' % getTimeStamp()

             stationOnline = True

         if debugOption:

-            print 'radiation update successful'

+            print 'data request successful'

     else:

         # The last attempt failed, so update the failed attempts

         # count.

         failedUpdateCount += 1

         if debugOption:

-           print 'radiation update failed'

+           print 'data request failed'

     if failedUpdateCount >= _MAX_FAILED_DATA_REQUESTS:

         # Max number of failed data requests, so set

@@ -346,7 +320,6 @@ def setStationStatus(updateSuccess):

         setStatusToOffline()

 ##end def

-

 def updateDatabase(dData):

     """

     Update the rrdtool database by executing an rrdtool system command.

@@ -386,7 +359,7 @@ def updateDatabase(dData):

 def createGraph(fileName, dataItem, gLabel, gTitle, gStart,

                 lower, upper, addTrend, autoScale):

-    """Uses rrdtool to create a graph of specified weather data item.

+    """Uses rrdtool to create a graph of specified radmon data item.

        Parameters:

            fileName - name of file containing the graph

            dataItem - data item to be graphed

@@ -438,7 +411,7 @@ def createGraph(fileName, dataItem, gLabel, gTitle, gStart,

                   % trendWindow[gStart]

     if verboseDebug:

-        print "%s\n" % strCmd # DEBUG

+        print "\n%s" % strCmd # DEBUG

     # Run the formatted rrdtool command as a subprocess.

     try:

@@ -450,7 +423,7 @@ def createGraph(fileName, dataItem, gLabel, gTitle, gStart,

         return False

     if debugOption:

-        print "rrdtool graph: %s" % result

+        print "rrdtool graph: %s" % result,

     return True

 ##end def

@@ -535,7 +508,7 @@ def main():

     ## Exit with error if rrdtool database does not exist.

     if not os.path.exists(_RRD_FILE):

         print 'rrdtool database does not exist\n' \

-              'use createWeatherRrd script to ' \

+              'use createRadmonRrd script to ' \

               'create rrdtool database\n'

         exit(1)

@@ -566,7 +539,6 @@ def main():

             # If conversion successful, write data to data files.

             if result:

-                writeInputDataFile(sData)

                 writeOutputDataFile(dData)

                 # At the rrdtool database update interval, update the database.

@@ -592,7 +564,7 @@ def main():

         elapsedTime = time.time() - currentTime

         if debugOption and not verboseDebug:

-            print

+            pass #print

         if verboseDebug:

             print "processing time: %6f sec\n" % elapsedTime

         remainingTime = dataRequestInterval - elapsedTime