svn commit: r1711846 - in /uima/sandbox/uima-ducc/trunk/src/main/admin: check_ducc ducc_util.py

[challngr]

Author: challngr
Date: Sun Nov  1 19:39:12 2015
New Revision: 1711846

URL: http://svn.apache.org/viewvc?rev=1711846&view=rev
Log:
UIMA-4577 Db updates.

Modified:
    uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc
    uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py

Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc?rev=1711846&r1=1711845&r2=1711846&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc Sun Nov  1 19:39:12 
2015
@@ -52,7 +52,7 @@ class CheckDucc(DuccUtil):
         return
 
     def verify_database(self):
-        if ( self.db_parms == self.db_disabled ):
+        if ( self.db_bypass == True ):
             return True
 
         ret = self.db_alive()

Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py?rev=1711846&r1=1711845&r2=1711846&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py Sun Nov  1 
19:39:12 2015
@@ -163,9 +163,10 @@ class DuccUtil(DuccBase):
     def db_configure(self):
         dbhost = self.ducc_properties.get('ducc.database.host')
         if ( dbhost == self.db_disabled ):
-            self.db_disabled = True
+            self.db_bypass = True
+            return;
         else:
-            self.db_disabled = False
+            self.db_bypass = False
 
         dbprops = Properties()
         dbprops.load(self.DUCC_HOME + '/resources.private/database.password')
@@ -196,7 +197,7 @@ class DuccUtil(DuccBase):
 
     # contact the database and see how useful it seems to be
     def db_alive(self):
-        if ( self.db_disabled == True ):
+        if ( self.db_bypass == True ):
             return True
 
         dbnode = self.ducc_properties.get('ducc.state.database.url')
@@ -219,7 +220,7 @@ class DuccUtil(DuccBase):
     def db_start(self):
 
         # bypass all of this for the initial delivery
-        if ( self.db_disabled == True) :
+        if ( self.db_bypass == True) :
             print '   (Bypass database start because ducc.database.host =', 
self.db_disabled + ')'
             return True
 
@@ -259,8 +260,8 @@ class DuccUtil(DuccBase):
 
     def db_stop(self):
 
-        if ( self.db_disabled == True) :
-            print '   (Bypass database start because ducc.database.host =', 
self.db_disabled + ')'
+        if ( self.db_bypass == True) :
+            print '   (Bypass database stop because ducc.database.host =', 
self.db_disabled + ')'
             return True
 
         pidfile = self.DUCC_HOME + '/state/cassandra.pid'