You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2013/05/30 18:46:17 UTC

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

Author: challngr
Date: Thu May 30 16:46:17 2013
New Revision: 1487926

URL: http://svn.apache.org/r1487926
Log:
UIMA-2929
Additional tweaks after trying the updates in production.

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=1487926&r1=1487925&r2=1487926&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc Thu May 30 16:46:17 2013
@@ -41,6 +41,7 @@ class CheckDucc(DuccUtil):
         verify_slave_node(checkdate, self.ducc_properties)
         self.check_clock_skew(checkdate)
         self.verify_jvm()
+        self.verify_duccling()
         return
 
 

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=1487926&r1=1487925&r2=1487926&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 Thu May 30 16:46:17 2013
@@ -555,16 +555,20 @@ class DuccUtil:
         # now make sure the version matches that on the master node
         lines = self.popen(self.duccling + ' -v')
         version_from_head = lines.readline().strip();
+        toks = version_from_head.split()
+        version_from_head = ' '.join(toks[0:4])
 
         version_file = self.DUCC_HOME + '/state/duccling.version';
         if ( os.path.exists(version_file) ):
             verfile = open(version_file)
             for line in verfile:
                 line = line.strip();
+                toks = line.split();
+                line = ' '.join(toks[0:4])
                 if ( line != version_from_head ):
                     print "Mismatched ducc_ling versions:"
-                    print "MASTER version:", version_from_head
-                    print "LOCAL  version:", line
+                    print "ALERT: Master version:", version_from_head
+                    print "ALERT: Local version:", line
                     return False
             verfile.close()
         else: