Change our default format to be more descriptive

This adds two characters to the length of our default format field, but
based on a conversation I had with kcr, I think this should probably be
okay. If it's a problem, the symptom we'll see is that certain people
will be unable to send zephyrs with this default format (so, certain
Humbug users will have their forwarding consistently fail).

We need to remember to, in a future commit (once everyone has started
using the updated version), remove the:
> or notice.format.endswith("@(@color(blue))")

(imported from commit 703ef60f524646bca8d5099c9066efabd365be43)
This commit is contained in:
Jacob Hurwitz 2013-02-04 14:19:43 -05:00 committed by Tim Abbott
parent 630b7ae521
commit 4448ba595a

View file

@ -285,7 +285,7 @@ def process_notice(notice, log):
logger.debug("Skipping ... %s/%s/%s" % logger.debug("Skipping ... %s/%s/%s" %
(zephyr_class, notice.instance, is_personal)) (zephyr_class, notice.instance, is_personal))
return return
if notice.format.endswith("@(@color(blue))"): if notice.format.startswith("Zephyr error: See") or notice.format.endswith("@(@color(blue))"):
logger.debug("Skipping message we got from Humbug!") logger.debug("Skipping message we got from Humbug!")
return return
@ -441,7 +441,7 @@ def forward_to_zephyr(message):
wrapped_content = "\n".join("\n".join(wrapper.wrap(line)) wrapped_content = "\n".join("\n".join(wrapper.wrap(line))
for line in message["content"].split("\n")) for line in message["content"].split("\n"))
zwrite_args = ["zwrite", "-n", "-s", zsig_fullname, "-F", "http://zephyr.1ts.org/wiki/df @(@color(blue))"] zwrite_args = ["zwrite", "-n", "-s", zsig_fullname, "-F", "Zephyr error: See http://zephyr.1ts.org/wiki/df"]
if message['type'] == "stream": if message['type'] == "stream":
zephyr_class = message["display_recipient"] zephyr_class = message["display_recipient"]
instance = message["subject"] instance = message["subject"]