Changeset 40126 for trunk

Timestamp:

Aug 26, 2017, 7:21:58 AM (9 years ago)

Author:

heather

Message:

fits.py would hang when encountering a 0 length file, now it correctly faults and crashes

File:

• trunk/ippToPsps/jython/fits.py (modified) (3 diffs)

trunk/ippToPsps/jython/fits.py

@@ -39 +39 @@
                time.sleep(time_wait)
                time_wait= 120 #(first time, wait 30 seconds)
+               
 
        if success == 0:
@@ -44 +45 @@
            return           
 
+       if os.path.getsize(self.originalPath)==0:
+           success = 0
+           self.logger.errorPair("empty file, 0 bytes", self.originalPath)
+           return           
        # does this file even exist?
        #if not os.path.isfile(self.originalPath): 
@@ -58 +63 @@
        # open the local copy and parse the header
        #self.file = open(self.localCopyPath)
+       self.logger.infoPair("opening FITS file",self.originalPath)
        self.file = open(self.originalPath)
+       self.logger.infoPair("parsing", "header")
        self.header = self.parseHeader()
+
        #self.logger.debugPair("FITS local copy", self.localCopyPath)
-       self.logger.debugPair("FITS primary header", "%d cards found" % len(self.header))
+       self.logger.infoPair("FITS primary header", "%d cards found" % len(self.header))
 
        # move file pointer back to the start of the file