svn commit: r1833473 - /uima/uima-ducc/trunk/src/main/admin/ducc_props_manager

[de...@apache.org]

Author: degenaro
Date: Wed Jun 13 19:16:01 2018
New Revision: 1833473

URL: http://svn.apache.org/viewvc?rev=1833473&view=rev
Log:
UIMA-5742 Reliable DUCC - when merging ducc.properties, support moving old key ducc.database.host to new key ducc.database.host.list

Modified:
    uima/uima-ducc/trunk/src/main/admin/ducc_props_manager

Modified: uima/uima-ducc/trunk/src/main/admin/ducc_props_manager
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/admin/ducc_props_manager?rev=1833473&r1=1833472&r2=1833473&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/admin/ducc_props_manager (original)
+++ uima/uima-ducc/trunk/src/main/admin/ducc_props_manager Wed Jun 13 19:16:01 2018
@@ -50,6 +50,16 @@ class DuccPropManager:
 
         file3_props = Properties()
 
+        # Check for a site specification override of the property renamed in 2.2.3
+        oname = 'ducc.database.host'
+        nname = 'ducc.database.host.list'
+        prop = file2_props.get_property(oname)
+        if prop != None:
+            prop.c.append('# RENAMED by merger ' + time.strftime('%c') + ' old name: ' + prop.k)
+            prop.k = nname
+            file2_props.put_property(prop)
+            file2_props.delete(oname)
+            
         # Check for a site specification override of the property renamed in 2.1.0
         oname = 'ducc.threads.limit'
         nname = 'ducc.job.max.pipelines.count'