You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2018/05/24 14:26:02 UTC
svn commit: r1832175 - in /uima/uima-ducc/trunk:
src/main/admin/ducc_post_install
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesHelper.java
Author: degenaro
Date: Thu May 24 14:26:02 2018
New Revision: 1832175
URL: http://svn.apache.org/viewvc?rev=1832175&view=rev
Log:
UIMA-5742 Reliable DUCC - improve db auto-manage specification interpretation (db node list implies not auto-managed)
Modified:
uima/uima-ducc/trunk/src/main/admin/ducc_post_install
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesHelper.java
Modified: uima/uima-ducc/trunk/src/main/admin/ducc_post_install
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/admin/ducc_post_install?rev=1832175&r1=1832174&r2=1832175&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/admin/ducc_post_install (original)
+++ uima/uima-ducc/trunk/src/main/admin/ducc_post_install Thu May 24 14:26:02 2018
@@ -340,10 +340,17 @@ class PostInstall():
def setup_ducc_database(self):
# ducc.database.automanage
- if(self.database_automanage == True):
- self.update_property('ducc.database.automanage', 'True', '# Database start/stop managed by DUCC')
- else:
+ if(self.database_automanage == None):
+ if ( self.database_host_list == None ):
+ # db automanage default to T when db host list not specified
+ self.database_automanage = True
+ else:
+ # db automanage default to F when db host list specified
+ self.database_automanage = False
+ if(self.database_automanage == False):
self.update_property('ducc.database.automanage', 'False', '# Database start/stop not managed by DUCC')
+ else:
+ self.update_property('ducc.database.automanage', 'True', '# Database start/stop managed by DUCC')
# ducc.database.host.list
if ( self.database_host_list == None ):
self.database_host_list = self.ducc_head
@@ -433,7 +440,7 @@ class PostInstall():
self.ducc_uid = None
self.ducc_head = None
self.keystore_pw = None
- self.database_automanage = True
+ self.database_automanage = None
self.database_host_list = None
self.database_user = None
self.database_pw = None
Modified: uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesHelper.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesHelper.java?rev=1832175&r1=1832174&r2=1832175&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesHelper.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesHelper.java Thu May 24 14:26:02 2018
@@ -45,7 +45,7 @@ public class DuccPropertiesHelper {
public static boolean isDatabaseAutomanaged() {
boolean retVal = true;
String key = DuccPropertiesResolver.ducc_database_automanage;
- String value = DuccPropertiesResolver.get(key,defaultDuccHead);
+ String value = DuccPropertiesResolver.get(key);
if(value != null) {
Boolean bool = new Boolean(value);
retVal = bool.booleanValue();