Some error handling work

This commit is contained in:
2020-01-03 14:13:39 -05:00
parent 0ea6e18fb9
commit 15c4090a94
13 changed files with 1615 additions and 2850 deletions

View File

@@ -4,6 +4,6 @@ import "github.com/sirupsen/logrus"
func handleErr(err error) {
if err != nil {
logrus.WithError(err).Fatal("Error during database operation!")
logrus.WithError(err).Error("Error during database operation!")
}
}

View File

@@ -81,6 +81,9 @@ func (database *Database) GetLogs(since int64, level LogLevel) *[]LogEntry {
rows, err := db.Query("SELECT * FROM log_entry WHERE timestamp > $1 AND level=$2",
since, level)
handleErr(err)
if err != nil {
return nil
}
for rows.Next() {

View File

@@ -36,11 +36,17 @@ func (database *Database) MakeProjectSnapshots() {
extract(epoch from now() at time zone 'utc')
FROM project`)
handleErr(err)
if err != nil {
return
}
inserted, _ := insertRes.RowsAffected()
res, err := db.Exec(`DELETE FROM project_monitoring_snapshot WHERE timestamp < $1`,
int64(time.Now().Unix())-int64(config.Cfg.MonitoringHistory.Seconds()))
handleErr(err)
if err != nil {
return
}
deleted, _ := res.RowsAffected()
logrus.WithFields(logrus.Fields{
@@ -60,6 +66,9 @@ func (database *Database) GetMonitoringSnapshotsBetween(pid int64, from int, to
worker_access_count, awaiting_verification_task_count, timestamp FROM project_monitoring_snapshot
WHERE project=$1 AND timestamp BETWEEN $2 AND $3 ORDER BY TIMESTAMP DESC `, pid, from, to)
handleErr(err)
if err != nil {
return
}
for rows.Next() {
@@ -91,6 +100,9 @@ func (database *Database) GetNMonitoringSnapshots(pid int64, count int) (ss *[]P
worker_access_count, awaiting_verification_task_count, timestamp FROM project_monitoring_snapshot
WHERE project=$1 ORDER BY TIMESTAMP DESC LIMIT $2`, pid, count)
handleErr(err)
if err != nil {
return
}
for rows.Next() {
s := ProjectMonitoringSnapshot{}

View File

@@ -168,6 +168,9 @@ func (database Database) GetAllProjects(managerId int64) *[]Project {
ORDER BY name`, managerId)
}
handleErr(err)
if err != nil {
return nil
}
for rows.Next() {
p := Project{}