0003512: Make snapshot name configurable

JumpMind · May 14, 2019 · a2d0854 · a2d0854
1 parent 95afbf8
commit a2d0854
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/util/SnapshotUtil.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/util/SnapshotUtil.java
@@ -406,7 +406,10 @@ public static File createSnapshot(ISymmetricEngine engine) {
 
         File jarFile = null;
         try {
-            jarFile = new File(getSnapshotDirectory(engine), tmpDir.getName() + ".zip");
+            String filename = tmpDir.getName() + ".zip";
+            if (parameterService.is(ParameterConstants.SNAPSHOT_FILE_INCLUDE_HOSTNAME))
+                filename = AppUtils.getHostName() + "_" + filename;
+            jarFile = new File(getSnapshotDirectory(engine), filename); 
             ZipBuilder builder = new ZipBuilder(tmpDir, jarFile, new File[] { tmpDir });
             builder.build();
             FileUtils.deleteDirectory(tmpDir);

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/common/ParameterConstants.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/common/ParameterConstants.java
@@ -487,6 +487,8 @@ private ParameterConstants() {
     public final static String CLOUD_BULK_LOAD_AZURE_BLOB_CONTAINER = "cloud.bulk.load.azure.blob.container";
     public final static String CLOUD_BULK_LOAD_AZURE_SAS_TOKEN = "cloud.bulk.load.azure.sas.token";
 
+    public final static String SNAPSHOT_FILE_INCLUDE_HOSTNAME = "snapshot.file.include.hostname";
+
     public static Map<String, ParameterMetaData> getParameterMetaData() {
         return parameterMetaData;
     }

diff --git a/symmetric-core/src/main/resources/symmetric-default.properties b/symmetric-core/src/main/resources/symmetric-default.properties
@@ -2522,3 +2522,10 @@ cloud.bulk.load.azure.blob.container=symmetricds
 # DatabaseOverridable: true
 # Tags: cloud, snowflake, azure
 cloud.bulk.load.azure.sas.token=
+
+# Prefix snapshot filename with hostname to indicate which environment it came from
+#
+# DatabaseOverridable: true
+# Tags: other
+# Type: boolean
+snapshot.file.include.hostname=false