Add CLI `rq` to empty queues and requeue failed jobs #401

zhangliyong · 2014-08-14T07:32:15Z

Usage: rq [OPTIONS] COMMAND [ARGS]...

Options:
  -u, --url TEXT  URL describing Redis connection details.
  --help          Show this message and exit.

Commands:
  empty    Empty queues, default: empty failed queue $...
  requeue  Requeue all failed jobs in failed queue

e.g.

$ rq empty
2 jobs removed from failed queue

$ rq -u 'redis://localhost:6379/0' empty default high
10 jobs removed from default queue
2 jobs removed from high queue

$ rq requeue
Requeuing 4 failed jobs......
Requeue over with 0 jobs requeuing failed

coveralls · 2014-08-14T07:34:29Z

Coverage remained the same when pulling 7f3cb8e on zhangliyong:cli-rq into 2409e81 on nvie:master.

zhangliyong · 2014-08-14T07:52:52Z

Now I have not add rq console_scripts in setup.py, so you can use pyfuncrun to run rq function, or you have a better way : )

e.g.

$ pyfuncrun rq.scripts.rq.rq --help
$ pyfuncrun rq.scripts.rq.rq empty

coveralls · 2014-08-14T07:58:47Z

Coverage decreased (-0.15%) when pulling e1d236e on zhangliyong:cli-rq into 2409e81 on nvie:master.

coveralls · 2014-08-15T06:22:08Z

Coverage increased (+1.94%) when pulling 36880db on zhangliyong:cli-rq into 2409e81 on nvie:master.

coveralls · 2014-08-15T08:27:42Z

Coverage increased (+1.94%) when pulling e948bde on zhangliyong:cli-rq into 2409e81 on nvie:master.

coveralls · 2014-08-19T02:31:44Z

Coverage increased (+1.94%) when pulling 551483b on zhangliyong:cli-rq into 2409e81 on nvie:master.

selwin · 2014-08-20T05:38:45Z

rq/scripts/rq_cli.py

+    if url is None:
+        url = "redis://localhost:6379/0"
+    redis_conn = redis.from_url(url)
+    use_connection(redis_conn)


Let's avoid using use_connection when possible. Instead, we should instantiate queues directly using Redis connections.

…ction

coveralls · 2014-08-21T07:18:05Z

Coverage increased (+1.94%) when pulling 1e5a8b5 on zhangliyong:cli-rq into 2409e81 on nvie:master.

coveralls · 2014-08-22T02:11:49Z

Coverage increased (+2.39%) when pulling 1ab9260 on zhangliyong:cli-rq into 2409e81 on nvie:master.

coveralls · 2014-08-22T02:24:44Z

Coverage increased (+0.45%) when pulling bc8fe29 on zhangliyong:cli-rq into 5331dc4 on nvie:master.

coveralls · 2014-08-22T02:47:25Z

Coverage increased (+0.63%) when pulling 1c97a55 on zhangliyong:cli-rq into 5331dc4 on nvie:master.

coveralls · 2014-08-22T02:47:25Z

Coverage increased (+0.63%) when pulling 1c97a55 on zhangliyong:cli-rq into 5331dc4 on nvie:master.

coveralls · 2014-08-22T02:58:28Z

Coverage increased (+0.45%) when pulling 37748e5 on zhangliyong:cli-rq into 5331dc4 on nvie:master.

coveralls · 2014-09-01T07:16:12Z

Coverage increased (+0.63%) when pulling 0ddd174 on zhangliyong:cli-rq into 5331dc4 on nvie:master.

coveralls · 2014-09-01T07:16:12Z

Coverage increased (+0.63%) when pulling 0ddd174 on zhangliyong:cli-rq into 5331dc4 on nvie:master.

coveralls · 2014-09-01T07:19:19Z

Coverage increased (+0.63%) when pulling 5883bb9 on zhangliyong:cli-rq into 2e6f86d on nvie:master.

nvie · 2014-09-01T07:23:51Z

rq/scripts/rqinfo.py

-from rq import get_failed_queue, Queue, Worker
-from rq.scripts import (add_standard_arguments, read_config_file,
-                        setup_default_arguments, setup_redis)
-from rq.utils import gettermsize, make_colorizer


You may remove these helper functions from rq.utils since they aren't used anymore.

coveralls · 2014-09-01T07:24:05Z

Coverage increased (+0.63%) when pulling ae1681e on zhangliyong:cli-rq into 2e6f86d on nvie:master.

nvie · 2014-09-01T07:24:49Z

setup.py

@@ -17,7 +17,7 @@ def get_version():


 def get_dependencies():
-    deps = ['redis >= 2.7.0']
+    deps = ['redis >= 2.7.0', 'click > 3.0']


yes >=, my careless :)

nvie · 2014-09-01T07:29:58Z

I gotta agree with @selwin that this is looking great :)

coveralls · 2014-09-02T04:09:33Z

Coverage increased (+2.22%) when pulling 3eabe76 on zhangliyong:cli-rq into 2e6f86d on nvie:master.

zhangliyong · 2014-09-02T04:11:28Z

@selwin @nvie Fix these issues, and move back rqinfo command, it has the same interface as before, and rq worker command is on my way. please review when you have time, thanks :)

zhangliyong · 2014-09-05T06:12:00Z

remind to review when you have time :)

selwin · 2014-09-06T03:15:20Z

Will try to review soon. Sorry for the wait!

nvie · 2014-09-06T06:48:16Z

This PR was great! I changed some subtle things, mostly style fixes, and command descriptions, to be a little more Unix-y, and made sure the default invocation does not do anything implicitly (so people are encouraged to check the --help, instead of implicitly having done damage). Most notable change was a small rehaul of the rq empty command, see 07dda74.

Thanks a lot!

I'm looking forward to see the rqworker command be moved under this umbrella, too.

zhangliyong · 2014-09-06T08:03:20Z

@nvie yes, it's much conciser, thanks! I will add rq worker command soon.

nvie · 2014-09-06T09:12:53Z

I'm currently restructuring the new CLI code a bit, will commit in a sec.

selwin · 2014-09-06T09:19:51Z

@nvie can you take a quick look at #391 when you're free? Just want to make sure I don't do anything too stupid fundamentally and I'll take care of the polishing myself later on ;)

nvie · 2014-09-06T09:21:48Z

Here's my change: b5fbc39.

zhangliyong · 2014-09-07T03:46:48Z

@nvie OK, I'll review it, and add rqworker based on this.

zhangliyong added 2 commits August 14, 2014 15:11

Add CLI rq to empty queues and requeue failed jobs

07aea5e

Merge branch 'master' into cli-rq

7f3cb8e

Use click.echo instead of print to output

e1d236e

Show progressbar when requeuing

36880db

zhangliyong added 3 commits August 15, 2014 15:06

Make command empty help message friendly

f845ae2

Format empty help message

81febc6

Add rq command when installing

e948bde

Add rq info command

551483b

selwin reviewed Aug 20, 2014
View reviewed changes

zhangliyong added 3 commits August 21, 2014 11:00

Fix import error

adc24b6

Avoid using use_connection, initial queues directly using redis conne…

c90da53

…ction

Use -y option to confirm emptying failed queue by default

1e5a8b5

zhangliyong added 3 commits August 22, 2014 10:08

Use 'with Connection' instead of 'use_connection'

0c4e28b

Add testcase for rq_cli

1ab9260

Merge branch 'master' of github.com:nvie/rq into cli-rq

bc8fe29

compat str.format syntax with py26

1c97a55

Make pep8

37748e5

zhangliyong added 4 commits September 1, 2014 14:06

Make pythonic

f734708

Adjust test_requeue

8782b11

Fix invoking requeue command bug in test_requeue

0ddd174

Merge branch 'master' of github.com:nvie/rq into cli-rq

de471b7

Make pep8

5883bb9

Change doc of rq cli

ae1681e

nvie reviewed Sep 1, 2014
View reviewed changes

selwin mentioned this pull request Sep 1, 2014

--ignore-failed option #410

Closed

zhangliyong added 3 commits September 2, 2014 10:04

Fix click dependency version

c796e32

Remove unused function 'gettersize'

4248c93

Move back rqinfo command for backward compatibility

3eabe76

nvie merged commit 3eabe76 into rq:master Sep 6, 2014

zhangliyong deleted the cli-rq branch September 19, 2014 06:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add CLI `rq` to empty queues and requeue failed jobs #401

Add CLI `rq` to empty queues and requeue failed jobs #401

zhangliyong commented Aug 14, 2014

coveralls commented Aug 14, 2014

zhangliyong commented Aug 14, 2014

coveralls commented Aug 14, 2014

coveralls commented Aug 15, 2014

coveralls commented Aug 15, 2014

coveralls commented Aug 19, 2014

selwin Aug 20, 2014

coveralls commented Aug 21, 2014

coveralls commented Aug 22, 2014

coveralls commented Aug 22, 2014

coveralls commented Aug 22, 2014

coveralls commented Aug 22, 2014

coveralls commented Aug 22, 2014

coveralls commented Sep 1, 2014

coveralls commented Sep 1, 2014

coveralls commented Sep 1, 2014

nvie Sep 1, 2014

coveralls commented Sep 1, 2014

nvie Sep 1, 2014

zhangliyong Sep 1, 2014

nvie commented Sep 1, 2014

coveralls commented Sep 2, 2014

zhangliyong commented Sep 2, 2014

zhangliyong commented Sep 5, 2014

selwin commented Sep 6, 2014

nvie commented Sep 6, 2014

zhangliyong commented Sep 6, 2014

nvie commented Sep 6, 2014

selwin commented Sep 6, 2014

nvie commented Sep 6, 2014

zhangliyong commented Sep 7, 2014

Add CLI rq to empty queues and requeue failed jobs #401

Add CLI rq to empty queues and requeue failed jobs #401

Conversation

zhangliyong commented Aug 14, 2014

coveralls commented Aug 14, 2014

zhangliyong commented Aug 14, 2014

coveralls commented Aug 14, 2014

coveralls commented Aug 15, 2014

coveralls commented Aug 15, 2014

coveralls commented Aug 19, 2014

selwin Aug 20, 2014

Choose a reason for hiding this comment

coveralls commented Aug 21, 2014

coveralls commented Aug 22, 2014

coveralls commented Aug 22, 2014

coveralls commented Aug 22, 2014

coveralls commented Aug 22, 2014

coveralls commented Aug 22, 2014

coveralls commented Sep 1, 2014

coveralls commented Sep 1, 2014

coveralls commented Sep 1, 2014

nvie Sep 1, 2014

Choose a reason for hiding this comment

coveralls commented Sep 1, 2014

nvie Sep 1, 2014

Choose a reason for hiding this comment

zhangliyong Sep 1, 2014

Choose a reason for hiding this comment

nvie commented Sep 1, 2014

coveralls commented Sep 2, 2014

zhangliyong commented Sep 2, 2014

zhangliyong commented Sep 5, 2014

selwin commented Sep 6, 2014

nvie commented Sep 6, 2014

zhangliyong commented Sep 6, 2014

nvie commented Sep 6, 2014

selwin commented Sep 6, 2014

nvie commented Sep 6, 2014

zhangliyong commented Sep 7, 2014

Add CLI `rq` to empty queues and requeue failed jobs #401

Add CLI `rq` to empty queues and requeue failed jobs #401