#222 Logging when resource directories not found

Author: rjrudin

src/main/java/com/marklogic/appdeployer/command/AbstractCommand.java

@@ -206,6 +206,12 @@ protected File[] listFilesInDirectory(File dir) {
         return files;
     }
 
+    protected void logResourceDirectoryNotFound(File dir) {
+    	 if (dir != null && logger.isInfoEnabled()) {
+		    logger.info("No resource directory found at: " + dir.getAbsolutePath());
+	    }
+    }
+
     public void setPayloadTokenReplacer(PayloadTokenReplacer payloadTokenReplacer) {
         this.payloadTokenReplacer = payloadTokenReplacer;
     }

src/main/java/com/marklogic/appdeployer/command/AbstractResourceCommand.java

@@ -55,8 +55,8 @@ protected File[] findResourceDirs(AppConfig appConfig, ResourceDirFinder resourc
 				File dir = resourceDirFinder.getResourceDir(configDir);
 				if (dir != null && dir.exists()) {
 					list.add(dir);
-				} else if (dir != null && logger.isInfoEnabled()) {
-					logger.info("No resource directory found at: " + dir.getAbsolutePath());
+				} else {
+					logResourceDirectoryNotFound(dir);
 				}
 			}
 		}
@@ -67,20 +67,22 @@ protected File[] findResourceDirs(AppConfig appConfig, ResourceDirFinder resourc
 	}
 
 	protected void processExecuteOnResourceDir(CommandContext context, File resourceDir) {
-        if (resourceDir.exists()) {
-            ResourceManager mgr = getResourceManager(context);
-            if (logger.isInfoEnabled()) {
-                logger.info("Processing files in directory: " + resourceDir.getAbsolutePath());
-            }
-            for (File f : listFilesInDirectory(resourceDir, context)) {
-		            if (logger.isInfoEnabled()) {
-			            logger.info("Processing file: " + f.getAbsolutePath());
-		            }
-		            SaveReceipt receipt = saveResource(mgr, context, f);
-		            afterResourceSaved(mgr, context, f, receipt);
-	            }
-            }
-    }
+		if (resourceDir.exists()) {
+			ResourceManager mgr = getResourceManager(context);
+			if (logger.isInfoEnabled()) {
+				logger.info("Processing files in directory: " + resourceDir.getAbsolutePath());
+			}
+			for (File f : listFilesInDirectory(resourceDir, context)) {
+				if (logger.isInfoEnabled()) {
+					logger.info("Processing file: " + f.getAbsolutePath());
+				}
+				SaveReceipt receipt = saveResource(mgr, context, f);
+				afterResourceSaved(mgr, context, f, receipt);
+			}
+		} else {
+			logResourceDirectoryNotFound(resourceDir);
+		}
+	}
 
 	/**
 	 * Defaults to the parent method. This was extracted so that a subclass can override it and have access to the

src/main/java/com/marklogic/appdeployer/command/alert/DeployAlertActionsCommand.java

@@ -48,6 +48,8 @@ protected void deployActions(CommandContext context, ConfigDir configDir, String
 					deployActionsInDirectory(f, context, databaseIdOrName);
 				}
 			}
+		} else {
+			logResourceDirectoryNotFound(configsDir);
 		}
 	}
 

src/main/java/com/marklogic/appdeployer/command/alert/DeployAlertRulesCommand.java

@@ -40,6 +40,8 @@ protected void deployRules(CommandContext context, ConfigDir configDir, String d
 					deployRulesInDirectory(f, context, databaseIdOrName);
 				}
 			}
+		} else {
+			logResourceDirectoryNotFound(configsDir);
 		}
 	}
 

src/main/java/com/marklogic/appdeployer/command/clusters/ModifyLocalClusterCommand.java

@@ -30,6 +30,8 @@ public void execute(CommandContext context) {
 						new ClusterManager(context.getManageClient()).modifyLocalCluster(payload, context.getAdminManager());
 					}
 				}
+			} else {
+				logResourceDirectoryNotFound(clustersDir);
 			}
 		}
 	}

src/main/java/com/marklogic/appdeployer/command/cpf/AbstractCpfResourceCommand.java

@@ -25,6 +25,8 @@ public void execute(CommandContext context) {
 			        String payload = copyFileToString(f, context);
 			        mgr.save(config.getTriggersDatabaseName(), payload);
 		        }
+	        } else {
+		        logResourceDirectoryNotFound(dir);
 	        }
         }
     }

src/main/java/com/marklogic/appdeployer/command/databases/DeployOtherDatabasesCommand.java

@@ -76,6 +76,8 @@ protected List<DeployDatabaseCommand> buildDatabaseCommands(CommandContext conte
 			        }
 			        dbCommands.add(buildDeployDatabaseCommand(f));
 		        }
+	        } else {
+	        	logResourceDirectoryNotFound(dir);
 	        }
         }
         return dbCommands;

src/main/java/com/marklogic/appdeployer/command/flexrep/DeployFlexrepCommand.java

@@ -48,6 +48,8 @@ public void execute(CommandContext context) {
 		            configDir.setBaseDir(currentBaseDir);
 	            }
             }
+        } else {
+	        logResourceDirectoryNotFound(flexrepBaseDir);
         }
     }
 
@@ -74,6 +76,9 @@ public void undo(CommandContext context) {
     protected File getFlexrepBaseDir(AppConfig appConfig) {
         String path = appConfig.getFlexrepPath();
         if (path == null) {
+        	if (logger.isInfoEnabled()) {
+        		logger.info("Flexrep path not configured, so not attempting to find any Flexrep resources to deploy");
+	        }
             return null;
         }
 
@@ -85,6 +90,7 @@ protected File getFlexrepBaseDir(AppConfig appConfig) {
         for (ConfigDir configDir : appConfig.getConfigDirs()) {
 	        File flexrepDir = configDir.getFlexrepDir();
 	        if (flexrepDir == null || !flexrepDir.exists()) {
+		        logResourceDirectoryNotFound(flexrepDir);
 		        continue;
 	        }
 

src/main/java/com/marklogic/appdeployer/command/flexrep/DeployTargetsCommand.java

@@ -44,6 +44,8 @@ protected void deployTargets(CommandContext context, ConfigDir configDir, String
 					deployTargetsInDirectory(f, context, databaseIdOrName);
 				}
 			}
+		} else {
+			logResourceDirectoryNotFound(configsDir);
 		}
 	}
 

src/main/java/com/marklogic/appdeployer/command/forests/ConfigureForestReplicasCommand.java

@@ -64,6 +64,7 @@ public void execute(CommandContext context) {
 
 		if ((databaseNamesAndReplicaCounts == null || databaseNamesAndReplicaCounts.isEmpty())
 			&& (forestNamesAndReplicaCounts == null || forestNamesAndReplicaCounts.isEmpty())) {
+			logger.info("No database or forest replica counts defined, so not configuring any forest replicas");
 			return;
 		}