[copr] skvidal-backend: fix up a few tyops (ee51389)

skvidal at fedoraproject.org skvidal at fedoraproject.org
Fri Nov 16 14:35:35 UTC 2012


Repository : http://git.fedorahosted.org/cgit/copr.git

On branch  : skvidal-backend

>---------------------------------------------------------------

commit ee51389a7802fa93f7f6e491fbd3fa10c0048f98
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Fri Nov 16 09:33:34 2012 -0500

    fix up a few tyops


>---------------------------------------------------------------

 backend/dispatcher.py |    2 +-
 copr-be.py            |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/dispatcher.py b/backend/dispatcher.py
index 4948512..3c03d87 100644
--- a/backend/dispatcher.py
+++ b/backend/dispatcher.py
@@ -136,7 +136,7 @@ class Worker(multiprocessing.Process):
         return jobdata
 
     def return_results(self, job):
-        self.log('%s status %s. Took %s seconds' % (job.id, job.status, build.ended_on - build.startedon)
+        self.log('%s status %s. Took %s seconds' % (job.id, job.status, job.ended_on - job.startedon))
         os.unlink(job.jobfile)
         #FIXME - this should either return job status/results 
         # into a queue or it should submit results directly to the frontend
diff --git a/copr-be.py b/copr-be.py
index 0e3e01a..fcf493a 100644
--- a/copr-be.py
+++ b/copr-be.py
@@ -50,7 +50,7 @@ class CoprBackend(object):
         try:
             cp.read(self.config_file)
             opts.results_baseurl = _get_conf(cp,'backend', 'results_baseurl', 'http://copr')
-            opts.frontend_url = _get_config(cp, 'backend', 'frontend_url', 'http://coprs/rest/api')
+            opts.frontend_url = _get_conf(cp, 'backend', 'frontend_url', 'http://coprs/rest/api')
             opts.frontend_auth = _get_conf(cp,'backend', 'frontend_auth', 'PASSWORDHERE')
             opts.playbook = _get_conf(cp,'backend','playbook', '/etc/copr/builder_playbook.yml')
             opts.jobsdir = _get_conf(cp, 'backend', 'jobsdir', None)
@@ -97,7 +97,7 @@ class CoprBackend(object):
             # this handles starting/growing the number of workers
             if len(self.workers) < self.opts.num_workers:
                 for i in range(self.opts.num_workers - len(self.workers)):
-                    w = dispatcher.Worker(self.opts, self.jobs)
+                    w = Worker(self.opts, self.jobs)
                     self.workers.append(w)
                     w.start()
             # FIXME - prune out workers
@@ -108,7 +108,7 @@ class CoprBackend(object):
             # FIXME - if a worker bombs out - we need to check them
             # and startup a new one if it happens
         
-            self.log("# jobs in queue: %s" % jobs.qsize())
+            self.log("# jobs in queue: %s" % self.jobs.qsize())
 
         time.sleep(self.opts.sleeptime)
 



More information about the copr-devel mailing list