Starting bug fix...

dsgoficial · Apr 4, 2016 · bf6d808 · bf6d808
1 parent 0a2bfe1
commit bf6d808
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/CGI/configurecluster.py b/CGI/configurecluster.py
@@ -152,6 +152,8 @@ def message(msg):
         message('Problema na criação do cluster: Versão de bancos incompatível com o plugin (Use somente EDGV 2.1.3 ou FTer_2a_Ed)')
 
     slony_temp = updateScript(slony, masterdb, slavedb, masterhost, slavehost, masterport, slaveport, masteruser, masterpass, slaveuser, slavepass, clustername)
+    message(slony)
+    message(slony_temp)
 
     # Configuring slony and subscribing
     cmd = 'sh {}'.format(slony_temp)

diff --git a/dsg_management_tools_dialog.py b/dsg_management_tools_dialog.py
@@ -241,7 +241,7 @@ def on_createClusterButton_clicked(self):
         if not supplied:
             return
 
-        #cheking slave's database version
+        #checking slave's database version
         db = self.getConnection(slavedb, slavehost, slaveport, slaveuser, slavepass)
         slaveversion = self.getDatabaseVersion(db)
 
@@ -250,7 +250,7 @@ def on_createClusterButton_clicked(self):
         if not supplied:
             return
 
-        #cheking master's database version
+        #checking master's database version
         db = self.getConnection(masterdb, masterhost, masterport, masteruser, masterpass)
         masterversion = self.getDatabaseVersion(db)
 
@@ -281,7 +281,7 @@ def on_startReplicationButton_clicked(self):
         if not supplied:
             return
 
-        #cheking slave's database version
+        #checking slave's database version
         db = self.getConnection(slavedb, slavehost, slaveport, slaveuser, slavepass)
         slaveversion = self.getDatabaseVersion(db)
 
@@ -290,7 +290,7 @@ def on_startReplicationButton_clicked(self):
         if not supplied:
             return
 
-        #cheking master's database version
+        #checking master's database version
         db = self.getConnection(masterdb, masterhost, masterport, masteruser, masterpass)
         masterversion = self.getDatabaseVersion(db)
 
@@ -416,9 +416,10 @@ def on_refreshButton_clicked(self):
                 children.append(text)
 
     def getDatabaseVersion(self, db):
+        version = '-1'
         if not db.open():
-            return '-1'
-        sqlVersion = 'SELECT edgvversion FROM public_db_metadata LIMIT 1'
+            return version
+        sqlVersion = 'SELECT edgvversion FROM db_metadata LIMIT 1'
         queryVersion = QSqlQuery(sqlVersion, db)
         while queryVersion.next():
             version = queryVersion.value(0)