Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 67384c85 by tchemit at 2020-04-16T12:01:30+02:00 Le nom du fichier de sauvegarde par défaut pourrait être modernisé - Closes #1212 - - - - - 2 changed files: - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java Changes: ===================================== client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -115,7 +115,7 @@ public class ClientConfig extends GeneratedClientConfig implements TemplateGener ClientConfigOption.MAP_LAYER10); private static final Logger log = LogManager.getLogger(ClientConfig.class); /** le pattern du fichier de sauvegarde d'une base locale */ - private static final String BACKUP_DB_PATTERN = "obstuna-local-%1$tF--%1$tk-%1$tM-%1$tS.sql.gz"; + private static final String BACKUP_DB_PATTERN = "observe-v%1$s-%2$tF--%2$tk-%2$tM-%2$tS.sql.gz"; private static final String APPLICATION_VERSION = "application.version"; private static final String VERSION = "version"; @@ -537,7 +537,7 @@ public class ClientConfig extends GeneratedClientConfig implements TemplateGener } public File newBackupDataFile() { - return new File(getBackupDirectory(), String.format(BACKUP_DB_PATTERN, new Date())); + return new File(getBackupDirectory(), String.format(BACKUP_DB_PATTERN, getBuildVersion(), new Date())); } public void saveForUser() { ===================================== client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java ===================================== @@ -74,7 +74,7 @@ public class BackupsManager implements Closeable { private static final Logger log = LogManager.getLogger(BackupsManager.class); - private static final Pattern AUTOMATIC_BACKUP_FILENAME_PATTERN = Pattern.compile("obstuna-local-([0-9-]+)\\.sql\\.gz"); + private static final Pattern AUTOMATIC_BACKUP_FILENAME_PATTERN = Pattern.compile("obs.+-([0-9-]+)\\.sql\\.gz"); private final Path backupsPath; private final ObserveDataSourcesManager dataSourcesManager; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/67384c85c3cb3c60979013ae5d... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/67384c85c3cb3c60979013ae5d... You're receiving this email because of your account on gitlab.com.