[manual] API add_subscriptions: Change arguments to support options.

Since in the future we might want requests to add subscriptions to
include things like colors, in_home_view, etc., we're changing the
data format for the add_subscriptions API call to pass each stream as
a dictionary, giving a convenient place to put any added options.

The manual step required here is updating the API version in AFS
available for use with the zephyr_mirror.py system.

(imported from commit 364960cca582a0658f0d334668822045c001b92c)
This commit is contained in:
Tim Abbott 2013-06-24 15:32:56 -04:00
parent 1373c5535e
commit 58f4ffe088
2 changed files with 3 additions and 2 deletions

View file

@ -675,7 +675,7 @@ def add_humbug_subscriptions(verbose):
zephyr_subscriptions.add(cls) zephyr_subscriptions.add(cls)
if len(zephyr_subscriptions) != 0: if len(zephyr_subscriptions) != 0:
res = humbug_client.add_subscriptions(list(zephyr_subscriptions)) res = humbug_client.add_subscriptions(list({"name": stream} for stream in zephyr_subscriptions))
if res.get("result") != "success": if res.get("result") != "success":
logger.error("Error subscribing to streams:\n%s" % (res["msg"],)) logger.error("Error subscribing to streams:\n%s" % (res["msg"],))
return return

View file

@ -48,4 +48,5 @@ if options.streams == "":
print >>sys.stderr, "Usage:", parser.usage print >>sys.stderr, "Usage:", parser.usage
sys.exit(1) sys.exit(1)
print client.add_subscriptions(options.streams.split()) print client.add_subscriptions([{"name": stream_name} for stream_name in
options.streams.split()])