Skip to content

Commit

Permalink
trim
Browse files Browse the repository at this point in the history
  • Loading branch information
Mohammed Karim committed May 18, 2019
1 parent da9bda3 commit 7120754
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion docker/job-spec.json.standard_product-s1gunw-topsapp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}
],
"recommended-queues" : [
"standard_product-s1gunw-topsapp"
"standard_product-s1gunw-topsapp-asg-fleet"
],
"soft_time_limit": 7200,
"time_limit": 7500,
Expand Down
21 changes: 11 additions & 10 deletions interferogram/sentinel/create_standard_product_s1.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,14 @@ def checkBurstError():

found, line = fileContainsMsg("create_standard_product_s1.log", msg)
if found:
logger.info("checkBurstError : %s" %line)
raise RuntimeError(line)
logger.info("checkBurstError : %s" %line.strip())
raise RuntimeError(line.strip())
if not found:
msg = "Could not determine a suitable burst offset"
msg = "Exception: Could not determine a suitable burst offset"
found, line = fileContainsMsg("create_standard_product_s1.log", msg)
if found:
logger.info("Found Error : %s" %line)
raise RuntimeError(line)
raise RuntimeError(line.strip())

'''
found, line = fileContainsMsg("_stderr.txt", msg)
Expand Down Expand Up @@ -1048,7 +1048,7 @@ def main():
preprocess_dem_file = "stitched.dem"
logger.info("Preprocess DEM file: {}".format(preprocess_dem_file))

checkBurstError()
#checkBurstError()

preprocess_dem_dir = "{}_{}".format(dem_type_simple, preprocess_dem_dir)

Expand Down Expand Up @@ -1089,7 +1089,7 @@ def main():
geocode_dem_file = os.path.join(geocode_dem_dir, geocode_dem_file)
logger.info("Using Geocode DEM file: {}".format(geocode_dem_file))
'''
checkBurstError()
#checkBurstError()

preprocess_vrt_file=""
if dem_type.startswith("SRTM"):
Expand Down Expand Up @@ -1682,6 +1682,7 @@ def main():
logger.info("New TopsApp Run Time : {}".format(complete_run_time))

def updateErrorFiles(msg):
msg = msg.strip()
err1 = "# ----- errors|exception found in log -----"
err2 = "error\|exception"

Expand Down Expand Up @@ -1726,14 +1727,14 @@ def updateErrorFiles(msg):
found, line = fileContainsMsg("create_standard_product_s1.log", msg)
if found:
logger.info("Found Error : %s" %line)
updateErrorFiles(line)
updateErrorFiles(line.strip())

if not found:
msg = "Could not determine a suitable burst offset"
msg = "Exception: Could not determine a suitable burst offset"
found, line = fileContainsMsg("create_standard_product_s1.log", msg)
if found:
logger.info("Found Error : %s" %line)
updateErrorFiles(line)
logger.info("Found Error : %s" %line.strip())
updateErrorFiles(line.strip())

if not found:
updateErrorFiles(str(e))
Expand Down

0 comments on commit 7120754

Please sign in to comment.