Loading ccserver/handlers.py +9 −7 Original line number Diff line number Diff line Loading @@ -626,19 +626,21 @@ class CliHandler(OnlineCCHandler): return errs.get_dict() @listed def jobs(self, conn, done=None): def jobs(self, conn, show_done=True, show_running=True): ''' Return all jobs. :param done: if True, show only done jobs, False, only not done jobs, and None (default) to show all. :param show_done: show done jobs :param show_running: show running jobs ''' props = ('id', 'status', 'created', 'ended', 'duration', 'done', 'author') jobs = [] for job in self._server.jobs.iterjobs(done): jobs.append(job.export()) for job in self._server.jobs.iterjobs(show_done, show_running): jobs.append(job.export(props)) return jobs return {'objects': jobs, 'order': props} @listed def cancel(self, conn, jobid): Loading ccserver/jobs.py +3 −2 Original line number Diff line number Diff line Loading @@ -315,7 +315,7 @@ class JobsManager(object): if job['done']: del self._jobs[job['id']] def iterjobs(self, done=None): def iterjobs(self, show_done=True, show_running=True): ''' Iter over jobs. Loading @@ -323,5 +323,6 @@ class JobsManager(object): ''' for job in self._jobs.itervalues(): if (done is None or job['done'] == done) and not job.get('_hidden'): if (show_done and job['done'] or show_running and not job['done'] and not job.get('_hidden')): yield job Loading
ccserver/handlers.py +9 −7 Original line number Diff line number Diff line Loading @@ -626,19 +626,21 @@ class CliHandler(OnlineCCHandler): return errs.get_dict() @listed def jobs(self, conn, done=None): def jobs(self, conn, show_done=True, show_running=True): ''' Return all jobs. :param done: if True, show only done jobs, False, only not done jobs, and None (default) to show all. :param show_done: show done jobs :param show_running: show running jobs ''' props = ('id', 'status', 'created', 'ended', 'duration', 'done', 'author') jobs = [] for job in self._server.jobs.iterjobs(done): jobs.append(job.export()) for job in self._server.jobs.iterjobs(show_done, show_running): jobs.append(job.export(props)) return jobs return {'objects': jobs, 'order': props} @listed def cancel(self, conn, jobid): Loading
ccserver/jobs.py +3 −2 Original line number Diff line number Diff line Loading @@ -315,7 +315,7 @@ class JobsManager(object): if job['done']: del self._jobs[job['id']] def iterjobs(self, done=None): def iterjobs(self, show_done=True, show_running=True): ''' Iter over jobs. Loading @@ -323,5 +323,6 @@ class JobsManager(object): ''' for job in self._jobs.itervalues(): if (done is None or job['done'] == done) and not job.get('_hidden'): if (show_done and job['done'] or show_running and not job['done'] and not job.get('_hidden')): yield job