Merge pull request #7 from pmandrik/master

Testing PR to trigger GitHub Workflow

README.md

@@ -136,3 +136,5 @@ Secrets and versions of DQM^2 need to match DQM^2 Mirror requirements, please ch
 
 
 
+
+

dqmsquare_cfg.py

@@ -405,6 +405,9 @@ def fill_graph(self, header, document):
     global_start = extra.get("global_start", datetime.datetime(2012, 3, 3, 10, 10, 10) )
     stream_data  = str(extra.get("streams", ""))
     hostname     = header.get("hostname", "")
+
+    if not isinstance(global_start, datetime.datetime):
+      global_start = datetime.datetime.fromtimestamp( global_start )
 
     values = [ run, rev, id, timestamp, global_start, stream_data, hostname ]
     values_dic = {}
@@ -420,7 +423,7 @@ def fill_graph(self, header, document):
         # cur.execute( sqlalchemy.insert( self.TB_NAME_GRAPHS ).values( values_dic )
         session.execute( sqlalchemy.insert( self.db_meta.tables[ self.TB_NAME_GRAPHS ] ).values( values_dic ) )
         session.commit()
-      except sqlite3.IntegrityError as e:
+      except Exception as e:
         self.log.error("Error occurred: ", e)
         session.rollback()
         return 1
@@ -479,7 +482,7 @@ def fill(self, header, document):
         session.execute("DELETE FROM " + self.TB_NAME + " WHERE id = '" + str(id) + "'" )
         session.execute( sqlalchemy.insert( self.db_meta.tables[ self.TB_NAME ] ).values( values_dic ) )
         session.commit()
-      except sqlite3.IntegrityError as e:
+      except Exception as e:
         self.log.error("Error occurred: ", e)
         session.rollback()
         return 1
@@ -645,7 +648,7 @@ def update_min_max( self, new_min, new_max ):
         session.execute("DELETE FROM " + self.TB_NAME_META + " WHERE name = 'min_max_runs';" )
         session.execute("INSERT INTO " + self.TB_NAME_META + " " + self.DESCRIPTION_SHORT_META + " VALUES('min_max_runs', '[" + str(new_min) + "," + str(new_max) + "]');" )
         session.commit()
-      except sqlite3.IntegrityError as e:
+      except Exception as e:
         self.log.error("Error occurred: ", e)
         session.rollback()
         return 1

requirements

@@ -6,3 +6,4 @@ Flask==2.0.2
 SQLAlchemy==1.4.41
 gunicorn==20.1.0
 psycopg2-binary
+werkzeug==2.0.3