From 87ca136ee855bde9caf19181bacd0b45c301230a Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: May 23 2017 15:21:35 +0000 Subject: [PATCH 1/3] Update celery dependency Signed-off-by: Patrick Uiterwijk --- diff --git a/files/pagure.spec b/files/pagure.spec index 81e5009..144c8fb 100644 --- a/files/pagure.spec +++ b/files/pagure.spec @@ -23,7 +23,7 @@ BuildRequires: python-arrow BuildRequires: python-binaryornot BuildRequires: python-bleach BuildRequires: python-blinker -BuildRequires: python2-celery +BuildRequires: python-celery BuildRequires: python-chardet BuildRequires: python-cryptography BuildRequires: python-docutils @@ -60,7 +60,7 @@ Requires: python-arrow Requires: python-binaryornot Requires: python-bleach Requires: python-blinker -Requires: python2-celery +Requires: python-celery Requires: python-chardet Requires: python-cryptography Requires: python-docutils From 8b90e4b5a04e833cbee218c042dc4bf2cf222d96 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: May 23 2017 15:23:22 +0000 Subject: [PATCH 2/3] Worker service unit file needs a full path Signed-off-by: Patrick Uiterwijk --- diff --git a/files/pagure_worker.service b/files/pagure_worker.service index 933d17d..539f363 100644 --- a/files/pagure_worker.service +++ b/files/pagure_worker.service @@ -4,7 +4,7 @@ After=redis.target Documentation=https://pagure.io/pagure [Service] -ExecStart=celery worker -A pagure.lib.tasks --loglevel=info --autoreload +ExecStart=/usr/bin/celery worker -A pagure.lib.tasks --loglevel=info --autoreload Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg" Type=simple User=git From 6256cdac0c602e53841fddf99f5acc1fd7911d3c Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: May 23 2017 16:03:23 +0000 Subject: [PATCH 3/3] Fix logcom server Signed-off-by: Patrick Uiterwijk --- diff --git a/pagure-logcom/pagure_logcom_server.py b/pagure-logcom/pagure_logcom_server.py index bc48382..5e4076e 100644 --- a/pagure-logcom/pagure_logcom_server.py +++ b/pagure-logcom/pagure_logcom_server.py @@ -91,8 +91,8 @@ def handle_messages(): commits = data['commits'] abspath = data['abspath'] - branch = ['data']['branch'] - default_branch = ['data']['default_branch'] + branch = data['branch'] + default_branch = data['default_branch'] repo = data['project']['name'] username = data['project']['username']['name'] \ if data['project']['parent'] else None