Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit 2c8ad14ab806b5e5693f8f498d46f07b4fe78c8f
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Thu Feb 19 01:09:05 2015 +0100
[backend] [rhbz:#1191037] RFE: Include package name and version in fedmsg
notification
---------------------------------------------------------------
backend/backend/daemons/dispatcher.py | 11 ++++++-----
backend/backend/job.py | 9 +++++++++
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/backend/backend/daemons/dispatcher.py
b/backend/backend/daemons/dispatcher.py
index 2cfb086..64b7039 100644
--- a/backend/backend/daemons/dispatcher.py
+++ b/backend/backend/daemons/dispatcher.py
@@ -170,18 +170,18 @@ class Worker(multiprocessing.Process):
self.mark_started(job)
template = "build start: user:{user} copr:{copr}" \
- " build:{build} ip:{ip} pid:{pid}"
+ "pkg: {pkg} build:{build} ip:{ip} pid:{pid}"
content = dict(user=job.submitter, copr=job.project_name,
- owner=job.project_owner,
+ owner=job.project_owner, pkg=job.pkg_name,
build=job.build_id, ip=self.vm_ip, pid=self.pid)
self.event("build.start", template, content)
template = "chroot start: chroot:{chroot} user:{user}" \
- "copr:{copr} build:{build} ip:{ip} pid:{pid}"
+ "copr:{copr} pkg: {pkg} build:{build} ip:{ip} pid:{pid}"
content = dict(chroot=job.chroot, user=job.submitter,
- owner=job.project_owner,
+ owner=job.project_owner, pkg=job.pkg_name,
copr=job.project_name, build=job.build_id,
ip=self.vm_ip, pid=self.pid)
@@ -196,10 +196,11 @@ class Worker(multiprocessing.Process):
self.return_results(job)
self.callback.log("worker finished build: {0}".format(self.vm_ip))
template = "build end: user:{user} copr:{copr} build:{build}" \
- " ip:{ip} pid:{pid} status:{status}"
+ " pkg: {pkg} version: {version} ip:{ip} pid:{pid}
status:{status}"
content = dict(user=job.submitter, copr=job.project_name,
owner=job.project_owner,
+ pkg=job.pkg_name, version=job.pkg_version,
build=job.build_id, ip=self.vm_ip, pid=self.pid,
status=job.status, chroot=job.chroot)
self.event("build.end", template, content)
diff --git a/backend/backend/job.py b/backend/backend/job.py
index 5f83ee1..aa9f580 100644
--- a/backend/backend/job.py
+++ b/backend/backend/job.py
@@ -71,6 +71,15 @@ class BuildJob(object):
self.built_packages = ""
+ @property
+ def pkg_name(self):
+ mb_name = self.pkg.split("/")[-1]
+ if mb_name:
+ mb_name = mb_name.replace(".src.rpm", "")
+ return mb_name
+ else:
+ return self.pkg
+
def update(self, data_dict):
"""