Changeset 33517 for trunk

Timestamp:

Mar 13, 2012, 4:25:53 PM (14 years ago)

Author:

rhenders

Message:

added method to get info from client table; added method to remove client by id; pause and kill methods now accept a range of client IDs

File:

• trunk/ippToPsps/jython/ipptopspsdb.py (modified) (3 diffs)

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -724 +724 @@
 
     '''
-    Pause all loading clients
-    '''
-    def pauseAllLoaders(self, bool):
-        self.setColForAllLoaders("paused", bool)
-
-    '''
-    Kill all loading clients
-    '''
-    def killAllLoaders(self, bool):
-        self.setColForAllLoaders("killed", bool)
+    Pause loading clients
+    '''
+    def pauseLoaders(self, bool, ids):
+        self.setColForLoaders("paused", bool, ids)
+
+    '''
+    Kill loading clients
+    '''
+    def killLoaders(self, bool, ids):
+        self.setColForLoaders("killed", bool, ids)
 
     '''
     Sets the value for a given column in the clients table
     '''
-    def setColForAllLoaders(self, col, bool):
+    def setColForLoaders(self, col, bool, ids):
+
         if bool: value = 1
         else: value = 0
-        self.execute("UPDATE clients SET " + col + " = " + str(value) + " WHERE type = 'loader.py' AND config = '" + self.config.name + "'")
+
+        for id in ids:
+            self.execute("UPDATE clients SET " + col + " = " + str(value) + " \
+                    WHERE type = 'loader.py' \
+                    AND id = " + str(id))
+
+    '''
+    Remove client by id
+    '''
+    def removeClientsByIds(self, ids):
+        for id in ids:
+            self.execute("DELETE FROM clients WHERE id = " + str(id))
 
     '''
@@ -996 +1008 @@
                WHERE ra_center = " + str(raCenter) + " \
                AND batch_type = '" + batchType + "' \
-               AND config = '" + self.config.name + "'"
+               AND config = '" + self.config.name + "' \
+               ORDER BY dec_center DESC"
 
         try:
@@ -1187 +1200 @@
 
     '''
+    Gets client info
+    '''
+    def getClientInfo(self):
+
+        sql = "SELECT id, host, started, timestamp, ra_center, paused, killed \
+               FROM stripe \
+               JOIN clients ON (client_id = id) \
+               WHERE clients.config = '" + self.config.name + "' \
+               ORDER BY host, started"
+
+        rows = []
+        try:
+            rs = self.executeQuery(sql)
+            while (rs.next()):
+                rows.append([rs.getInt(1), rs.getString(2), rs.getString(3), rs.getString(4), rs.getFloat(5), rs.getInt(6), rs.getInt(7)])
+            rs.close()
+        except:
+            self.logger.errorPair("Can't query for client data", sql)
+
+        return rows
+
+    '''
     Destructor
     '''