dbhandle: fix PEP686 fedora inconsistencies

This patch fixes a bug causing inconsistency between platforms. On PyPI mysql-connector, a fetchall with nothing to return yields an empty iterator. However, Fedora's PEP686 mysql-connector throws mysql.connector.errors.InterfaceError, preventing ssvp-interval from running correctly. This is mitigated with this patch.

Signed-off-by: Amy Parker <amy@amyip.net>

srv/dbhandle.py

@@ -21,7 +21,9 @@
 # https://www.gnu.org/licenses/agpl-3.0.en.html.
 
 import datetime
+
 import psycopg2
+import mysql.connector
 
 
 def unimplemented():
@@ -187,6 +189,8 @@ def _hdr(self, srv: str, st: int, conn) -> int:
             curr.fetchall()
         except psycopg2.ProgrammingError:
             pass
+        except mysql.connector.errors.InterfaceError:
+            pass
         conn.commit()
         curr.close()
         conn.close()
@@ -202,6 +206,8 @@ def _iil(self, srv: str, status: int, conn) -> None:
             curr.fetchall()
         except psycopg2.ProgrammingError:
             pass
+        except mysql.connector.errors.InterfaceError:
+            pass
         conn.commit()
         curr.close()
         conn.close()
@@ -228,7 +234,12 @@ def _ucs(self, srv: str, st: int, conn) -> None:
                     currentStatus = %s\
                 where serverName = %s;"
         curr.execute(self._treat_sql(sql), (srv, srv, srv, st, srv))
-        curr.fetchall()
+        try:
+            curr.fetchall()
+        except psycopg2.ProgrammingError:
+            pass
+        except mysql.connector.errors.InterfaceError:
+            pass
         conn.commit()
         curr.close()
         conn.close()
@@ -243,6 +254,8 @@ def _ics(self, srv: str, conn) -> None:
             curr.fetchall()
         except psycopg2.ProgrammingError:
             pass
+        except mysql.connector.errors.InterfaceError:
+            pass
         conn.commit()
         curr.close()
         conn.close()
@@ -274,6 +287,8 @@ def _fev(self, lim: int, page: int, conn) -> list:
             } for x in curr.fetchall()]
         except psycopg2.ProgrammingError:
             pass
+        except mysql.connector.errors.InterfaceError:
+            pass
         curr.close()
         conn.close()
         return res
@@ -288,6 +303,8 @@ def _sev(self, conn) -> int:
             res = curr.fetchone()[0]
         except psycopg2.ProgrammingError:
             pass
+        except mysql.connector.errors.InterfaceError:
+            pass
         curr.close()
         conn.close()
         return res

ssvp.spec.fmt

@@ -9,6 +9,7 @@ Source0:        %{name}-%{version}.tar.gz
 
 BuildRequires:  nodejs nodejs-npm make
 Requires:       bash python3 python3-gunicorn python3-mysqlclient python3-psycopg2 python3-pyOpenSSL python3-requests python3-flask jq
+BuildArch:      noarch
 
 %description
 SSVP - the Server Statistics Viewer Project