GitLab

at 2023-08-17T18:31:51+02:00

update pom

La valeur de configuration instance.security.key n'est pas bien enregistrée même si elle est présente dans les fichiers de configuration commun (/var/local/observe-server/.conf/9.x) - Closes #2769

      *

      * @since 1.5

      */

-    private final String[] doNotSave = new String[]{

+    private final Set<String> doNotSave = Set.of(

 //            ClientConfigOption.OBSTUNA_PASSWORD.getKey(),

-            ClientConfigOption.H2_PASSWORD.getKey(), ClientConfigOption.OBSTUNA_CAN_MIGRATE.getKey(),};

+            ClientConfigOption.H2_PASSWORD.getKey(), ClientConfigOption.OBSTUNA_CAN_MIGRATE.getKey());

     private final SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm z");

     /**

   <parent>

     <groupId>io.ultreia.maven</groupId>

     <artifactId>pom</artifactId>

-    <version>2023.37</version>

+    <version>2023.40</version>

   </parent>

   <groupId>fr.ird.observe</groupId>

   <artifactId>ird-observe</artifactId>

 import java.nio.file.Path;

 import java.util.Collections;

 import java.util.Map;

+import java.util.Properties;

+import java.util.Set;

 /**

  * Web server configuration.

         ServerConfig fakeConfig = new ServerConfig(setCommonExtraConfigDirectory(setConfigFileName(init)), true);

         fakeConfig.initFirst();

+        // Get extra scope options (if any)

+        Properties extraProperties = new Properties();

+        fakeConfig.get().putAll(extraProperties, ApplicationConfigScope.EXTRA);

+        extraProperties.put(ServerConfigOption.CONTEXT_PATH.getKey(), contextPath);

         // Now that common files are ready, starts a normal configuration without system file and without migration possible

         ApplicationConfigInit realInit = ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.ENV, ApplicationConfigScope.SYSTEM)

-                .addDefaults(ServerConfigOption.CONTEXT_PATH.getKey(), contextPath);

+                .setDefaults(extraProperties);

         ServerConfig config = new ServerConfig(setInstanceExtraConfigDirectory(setConfigFileName(realInit)));

         config.init(true);

         File extraConfigFile = get().getExtraConfigFile();

         if (Files.notExists(extraConfigFile.toPath())) {

             log.info(String.format("Save common configuration file to: %s", extraConfigFile));

-            ConfigHelper.save(get(), extraConfigFile, new String[0], ServerResources.APPLICATION_CONFIGURATION, options());

+            ConfigHelper.save(get(), extraConfigFile, Set.of(), ServerResources.APPLICATION_CONFIGURATION, options());

         }

         File log4jConfigurationFile = getCommonLog4jConfigurationFile();

         // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2735

         log.info(String.format("Save instance configuration file to: %s", extraConfigFile));

-        ConfigHelper.save(get(), extraConfigFile, new String[0], ServerResources.APPLICATION_CONFIGURATION, options());

+        ConfigHelper.save(get(), extraConfigFile, Set.of(), ServerResources.APPLICATION_CONFIGURATION, options());

         if (log.isInfoEnabled()) {

             String message = getConfigurationDescription();

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

3 changed files:

Changes: