zephyr_mirror: Use default format to indicate what came from Humbug.
(imported from commit 5c2fdccb08d605a37d6c87c37f023c06a0a9a760)
This commit is contained in:
parent
111a9bc0e6
commit
135f7f1b57
|
@ -237,7 +237,7 @@ def process_notice(notice, log):
|
||||||
# skip PING messages
|
# skip PING messages
|
||||||
return
|
return
|
||||||
|
|
||||||
if zsig.endswith("@(@color(blue))"):
|
if zsig.endswith("@(@color(blue))") or notice.format.endswith("@(@color(blue))"):
|
||||||
logger.debug("Skipping message we got from Humbug!")
|
logger.debug("Skipping message we got from Humbug!")
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -396,7 +396,9 @@ 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", "-s", zsig]
|
zwrite_args = ["zwrite", "-s", zsig, "-F", "Class $class, Instance $instance:\n" +
|
||||||
|
"To: @bold($recipient) at $time $date\n" +
|
||||||
|
"From: @bold{$1 <$sender>}\n\n$2@(@color(blue))"]
|
||||||
logger.info("Forwarding message from %s" % (message["sender_email"],))
|
logger.info("Forwarding message from %s" % (message["sender_email"],))
|
||||||
if message['type'] == "stream":
|
if message['type'] == "stream":
|
||||||
zephyr_class = message["display_recipient"]
|
zephyr_class = message["display_recipient"]
|
||||||
|
|
Loading…
Reference in a new issue