From 5ea1636dea9368c82569f6607936cde150a012ed Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 12 2018 14:24:55 +0000
Subject: Close the DB session in one place for all hooks


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/hooks/__init__.py b/pagure/hooks/__init__.py
index 365b3d5..027f582 100644
--- a/pagure/hooks/__init__.py
+++ b/pagure/hooks/__init__.py
@@ -437,6 +437,7 @@ def run_project_hooks(
                 haderrors = True
 
     if haderrors:
+        session.close()
         raise SystemExit(1)
 
 
diff --git a/pagure/hooks/default.py b/pagure/hooks/default.py
index c16aa5f..bf05680 100644
--- a/pagure/hooks/default.py
+++ b/pagure/hooks/default.py
@@ -315,8 +315,6 @@ class DefaultRunner(BaseRunner):
             parent.user.user if parent.is_fork else None,
         )
 
-        session.remove()
-
 
 class DefaultForm(FlaskForm):
     """ Form to configure the default hook. """
diff --git a/pagure/hooks/mirror_hook.py b/pagure/hooks/mirror_hook.py
index f9fa672..3bb24bd 100644
--- a/pagure/hooks/mirror_hook.py
+++ b/pagure/hooks/mirror_hook.py
@@ -85,8 +85,6 @@ class MirrorRunner(BaseRunner):
             name=project.name,
         )
 
-        session.close()
-
 
 class CustomRegexp(wtforms.validators.Regexp):
     def __init__(self, *args, **kwargs):
diff --git a/pagure/hooks/pagure_force_commit.py b/pagure/hooks/pagure_force_commit.py
index b46f9c7..d4d9a7e 100644
--- a/pagure/hooks/pagure_force_commit.py
+++ b/pagure/hooks/pagure_force_commit.py
@@ -87,10 +87,8 @@ class PagureForceCommitRunner(BaseRunner):
             if refname in branches or branches == ["*"]:
 
                 if set(newrev) == set(["0"]):
-                    session.close()
                     raise Exception("Deletion is forbidden")
                 elif pagure.lib.git.is_forced_push(oldrev, newrev, repodir):
-                    session.close()
                     raise Exception("Non fast-forward push is forbidden")