Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : skvidal-backend
---------------------------------------------------------------
commit 2a047db2d68b9439a6d63d01f1f31845f5a6a7a7
Author: Seth Vidal <skvidal(a)fedoraproject.org>
Date: Wed Dec 5 16:04:22 2012 -0500
- make pid file default to cwd unless specified
- better log output for the building
- fixme notes
---------------------------------------------------------------
backend/dispatcher.py | 7 ++++++-
copr-be.py | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/backend/dispatcher.py b/backend/dispatcher.py
index f96bdb1..16e0825 100644
--- a/backend/dispatcher.py
+++ b/backend/dispatcher.py
@@ -191,6 +191,10 @@ class Worker(multiprocessing.Process):
# parse the job json into our info
job = self.parse_job(jobfile)
+ # FIXME
+ # this is our best place to sanity check the job before starting
+ # up any longer process
+
job.jobfile = jobfile
# spin up our build instance
@@ -227,7 +231,7 @@ class Worker(multiprocessing.Process):
# start the build - most importantly license checks.
- self.callback.log('Calling mockremote with builder=%r timeout=%r
destdir=%r chroot=%r repos=%r' % (ip, job.timeout, job.destdir, chroot,
str(job.repos)))
+ self.callback.log('Starting build: builder=%r timeout=%r destdir=%r
chroot=%r repos=%r' % (ip, job.timeout, job.destdir, chroot, str(job.repos)))
try:
chrootlogfile = chroot_destdir + '/mockremote.log'
mr = mockremote.MockRemote(builder=ip, timeout=job.timeout,
@@ -239,6 +243,7 @@ class Worker(multiprocessing.Process):
# record and break
self.callback.log('%s - %s' % (ip, e))
status = 0 # failure
+ self.callback.log('Finished build: builder=%r timeout=%r destdir=%r
chroot=%r repos=%r' % (ip, job.timeout, job.destdir, chroot, str(job.repos)))
job.ended_on = time.time()
job.status = status
diff --git a/copr-be.py b/copr-be.py
index d98feea..5b35905 100644
--- a/copr-be.py
+++ b/copr-be.py
@@ -182,7 +182,7 @@ def parse_args(args):
help="config file to use for copr-be run")
parser.add_option('-d','--daemonize', default=False,
dest='daemonize',
action='store_true', help="daemonize or not")
- parser.add_option('-p', '--pidfile',
default='/var/run/copr-be.pid', dest='pidfile',
+ parser.add_option('-p', '--pidfile', default='copr-be.pid',
dest='pidfile',
help="pid file to use for copr-be if daemonized")
parser.add_option('-x', '--exit', default=False,
dest='exit_on_worker',
action='store_true', help="exit on worker failure")