more logging of slow operations #250

src/main/java/models/Bundle.java

@@ -175,7 +175,7 @@ public void save() {
 
 		bundleData.save(id, this);
 
-		LOG.info("saved bundle " +id);
+		LOG.info("Saved bundle {} and committed data.", id);
 	}
 
 	@JsonIgnore
@@ -210,7 +210,11 @@ public void processGtfs(final File gtfsFile, final String bundleType, final Stri
 	}
 
 	public void writeToClusterCache () throws IOException {
+		// These log messages should be clearer and located down inside the ClusterGraphService,
+		// but that class is in the OTP project so I'm just logging the operation at a higher stack frame.
+		LOG.info("Adding network inputs to cluster cache and uploading to S3 (if needed).");
 		clusterGraphService.addGraphFile(getBundleDataPath());
+		LOG.info("Done adding network inputs to cluster cache and uploading to S3 (if needed).");
 	}
 
 	public void processGtfs () {		
@@ -363,7 +367,7 @@ static public LocalDate fromInt (int date) {
 		int day = date % 100;
 		return LocalDate.of(year, month, day);
 	}
-	
+
 	static public void writeAllToClusterCache () throws IOException {
 		// two pass loop to avoid concurrent modification
 		List<String> bundlesToReprocess = new ArrayList<>();

src/main/java/models/Shapefile.java

@@ -358,16 +358,14 @@ public Integer getFeatureCount() {
 	}
 
 	private STRtree buildIndex() {
-		LOG.info("building index for shapefile " + this.id);
-
+		LOG.info("Building index for shapefile " + this.id);
 		// it's not possible to make an R-tree with only one node, so we make an r-tree with two
 		// nodes and leave one empty.
 		STRtree spatialIndex = new STRtree(Math.max(getShapeFeatureStore().size(), 2));
-
 		for(ShapeFeature feature : getShapeFeatureStore().getAll()) {
 			spatialIndex.insert(feature.geom.getEnvelopeInternal(), feature);
 		}
-
+		LOG.info("Done building index for shapefile " + this.id);
 		return spatialIndex;
 	}