From 67fabd1de4381abd2633ca11a05385242c197833 Mon Sep 17 00:00:00 2001 From: viktorstrate Date: Sat, 29 Feb 2020 09:21:41 +0100 Subject: [PATCH] Fix graphql query for share pages Properly close rows in scanner --- api/graphql/models/site_info.go | 1 + api/scanner/album_scanner.go | 1 + ui/src/Pages/SharePage/SharePage.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/api/graphql/models/site_info.go b/api/graphql/models/site_info.go index 0af3ec98..86683391 100644 --- a/api/graphql/models/site_info.go +++ b/api/graphql/models/site_info.go @@ -6,6 +6,7 @@ import ( func GetSiteInfo(db *sql.DB) (*SiteInfo, error) { rows, err := db.Query("SELECT * FROM site_info") + defer rows.Close() if err != nil { return nil, err } diff --git a/api/scanner/album_scanner.go b/api/scanner/album_scanner.go index 257c9b30..c51eaefd 100644 --- a/api/scanner/album_scanner.go +++ b/api/scanner/album_scanner.go @@ -412,6 +412,7 @@ func cleanupCache(database *sql.DB, scanned_albums []interface{}, user *models.U ScannerError("Could not get albums from database: %s\n", err) return } + defer rows.Close() deleted_albums := 0 deleted_ids := make([]interface{}, 0) diff --git a/ui/src/Pages/SharePage/SharePage.js b/ui/src/Pages/SharePage/SharePage.js index 1b4c228a..2a1be2bd 100644 --- a/ui/src/Pages/SharePage/SharePage.js +++ b/ui/src/Pages/SharePage/SharePage.js @@ -60,12 +60,12 @@ const tokenQuery = gql` maker lens dateShot - fileSize exposure aperture iso focalLength flash + exposureProgram } } `