Skip to content

Close DB pool connections that we open #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cpeel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Close DB pool connections that we open #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions libgutenberg/GutenbergDatabaseDublinCore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,8 @@ def load_from_database(self, ebook):
dcmitype.description = row.description
self.dcmitypes.append(dcmitype)

conn.close()

self.load_files_from_database(ebook)


Expand Down Expand Up @@ -326,6 +328,7 @@ def load_files_from_database(self, id_):
if row.mediatype:
self.mediatypes.add(row.mediatype)

conn.close()

def remove_filetype_from_database(self, id_, type_):
""" Remove filetype from PG database. """
Expand All @@ -342,6 +345,8 @@ def remove_filetype_from_database(self, id_, type_):
'fk_filetypes': type_ })
c.execute('commit')

conn.close()


def remove_file_from_database(self, filename):
""" Remove file from PG database. """
Expand All @@ -354,6 +359,8 @@ def remove_file_from_database(self, filename):
{ 'filename': filename })
c.execute('commit')

conn.close()


def store_file_in_database(self, id_, filename, type_):
""" Store file in PG database. """
Expand Down Expand Up @@ -400,13 +407,15 @@ def store_file_in_database(self, id_, filename, type_):
'diskstatus': diskstatus})

c.execute('commit')
conn.close()

except OSError:
error("Cannot stat %s", filename)

except IntegrityError:
error("Book number %s is not in database.", id_)
c.execute('rollback')
conn.close()


def register_coverpage(self, id_, url, code = 901):
Expand All @@ -431,3 +440,5 @@ def register_coverpage(self, id_, url, code = 901):
except DatabaseError as what:
warning("Error updating coverpage in database: %s.", what)
c.execute('rollback')

conn.close()