From d3ad5bb757bdc0a00b2f42d4f4d41bb02331c052 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Nov 05 2016 19:33:58 +0000
Subject: [PATCH 1/4] Do not cache the session in pagure-ci


We had the problem with the webhook service that the session wasn't
getting properly updated, so let's use a new session in pagure-ci to
avoid this problem as well.

---

diff --git a/pagure-ci/pagure_ci_server.py b/pagure-ci/pagure_ci_server.py
index a911685..b1f4b7f 100644
--- a/pagure-ci/pagure_ci_server.py
+++ b/pagure-ci/pagure_ci_server.py
@@ -69,7 +69,9 @@ def handle_messages():
         pr_uid = data['pr']['uid']
         branch = data['pr']['branch_from']
         LOG.info('Looking for PR: %s', pr_uid)
-        request = pagure.lib.get_request_by_uid(pagure.SESSION, pr_uid)
+        session = pagure.lib.create_session(pagure.APP.config['DB_URL'])
+        request = pagure.lib.get_request_by_uid(session, pr_uid)
+        session.close()
 
         if not request:
             LOG.warning(

From fe4b65c9c8ec3c10e70c2f29b4624b88f14521d7 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Nov 05 2016 19:33:58 +0000
Subject: [PATCH 2/4] Move logging config lower


---

diff --git a/pagure-ci/pagure_ci_server.py b/pagure-ci/pagure_ci_server.py
index b1f4b7f..df1a9cb 100644
--- a/pagure-ci/pagure_ci_server.py
+++ b/pagure-ci/pagure_ci_server.py
@@ -18,7 +18,6 @@ receiving end is offline or so.
 
 import json
 import logging
-logging.basicConfig(level=logging.DEBUG)
 import os
 import requests
 
@@ -131,6 +130,8 @@ if __name__ == '__main__':
     formatter = logging.Formatter(
         "%(asctime)s %(levelname)s [%(module)s:%(lineno)d] %(message)s")
 
+    logging.basicConfig(level=logging.DEBUG)
+
     # setup console logging
     LOG.setLevel(logging.DEBUG)
     shellhandler = logging.StreamHandler()

From 685dcc2ce1b6113ccff37f89b027d4e5b6c57ee6 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Nov 05 2016 19:33:58 +0000
Subject: [PATCH 3/4] Add a little more logging


---

diff --git a/pagure-ci/pagure_ci_server.py b/pagure-ci/pagure_ci_server.py
index df1a9cb..77ce990 100644
--- a/pagure-ci/pagure_ci_server.py
+++ b/pagure-ci/pagure_ci_server.py
@@ -71,6 +71,7 @@ def handle_messages():
         session = pagure.lib.create_session(pagure.APP.config['DB_URL'])
         request = pagure.lib.get_request_by_uid(session, pr_uid)
         session.close()
+        LOG.info('PR retrieved: %s', request)
 
         if not request:
             LOG.warning(

From be8146d4887c3ff2c65d06cef532f381c2a144a9 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Nov 05 2016 19:33:58 +0000
Subject: [PATCH 4/4] Only close the DB session at the end


---

diff --git a/pagure-ci/pagure_ci_server.py b/pagure-ci/pagure_ci_server.py
index 77ce990..5e931c6 100644
--- a/pagure-ci/pagure_ci_server.py
+++ b/pagure-ci/pagure_ci_server.py
@@ -70,12 +70,13 @@ def handle_messages():
         LOG.info('Looking for PR: %s', pr_uid)
         session = pagure.lib.create_session(pagure.APP.config['DB_URL'])
         request = pagure.lib.get_request_by_uid(session, pr_uid)
-        session.close()
+
         LOG.info('PR retrieved: %s', request)
 
         if not request:
             LOG.warning(
                 'No request could be found from the message %s', data)
+            session.close()
             continue
 
         LOG.info(
@@ -104,6 +105,7 @@ def handle_messages():
         else:
             LOG.warning('Un-supported CI type')
 
+        session.close()
         LOG.info('Ready for another')