Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 8dec4869 by tchemit at 2020-04-18T08:18:11+02:00 Le nom du fichier de sauvegarde par défaut pourrait être modernisé (report V8 → V7) - 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/backup/BackupsManager.java Changes: ===================================== client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -82,7 +82,7 @@ public class ClientConfig extends GeneratedClientConfig implements NavigationTre ClientConfigOption.MAP_LAYER9, ClientConfigOption.MAP_LAYER10); /** 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"; private static final String PROPERTY_LOCAL_STORAGE_EXIST = "localStorageExist"; @@ -368,13 +368,11 @@ public class ClientConfig extends GeneratedClientConfig implements NavigationTre } 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() { - if (log.isInfoEnabled()) { - log.info(t("observe.message.save.configuration", get().getUserConfigFile())); - } + log.info(t("observe.message.save.configuration", get().getUserConfigFile())); get().saveForUser(unsavables); } ===================================== client-core/src/main/java/fr/ird/observe/client/backup/BackupsManager.java ===================================== @@ -66,7 +66,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 Path storePath; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8dec4869d5c43fbf10f61cf7cb... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8dec4869d5c43fbf10f61cf7cb... You're receiving this email because of your account on gitlab.com.