Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

zephyr_mirror: Use a variable for humbug_account_email. 

(imported from commit 90da406a5eab67d20b42243e96b8afb3e5b5f342)
This commit is contained in:
Tim Abbott 2012-12-08 12:59:40 -05:00
parent 6ff666b9d7
commit 17a0246b0b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/bots/zephyr_mirror_backend.py
View File

@ -131,8 +131,8 @@ def send_humbug(zeph):
def send_error_humbug(error_msg): def send_error_humbug(error_msg):
message = {"type": "private", message = {"type": "private",
"sender": options.user + "@mit.edu", "sender": humbug_account_email,
"to": options.user + "@mit.edu", "to": humbug_account_email,
"content": error_msg, "content": error_msg,
} }
humbug_client.send_message(message) humbug_client.send_message(message)
@ -521,7 +521,7 @@ received it, Zephyr users did not. The error message from zwrite was:
%s""" % (heading, stderr, support_closing)) %s""" % (heading, stderr, support_closing))
def maybe_forward_to_zephyr(message): def maybe_forward_to_zephyr(message):
if (message["sender_email"] == options.user + "@mit.edu"): if (message["sender_email"] == humbug_account_email):
if not ((message["type"] == "stream") or if not ((message["type"] == "stream") or
(message["type"] == "private" and (message["type"] == "private" and
False not in [u["email"].lower().endswith("mit.edu") for u in False not in [u["email"].lower().endswith("mit.edu") for u in
@ -797,9 +797,10 @@ or specify the --api-key-file option.""" % (options.api_key_file,)))
# don't need to read it in # don't need to read it in
os.environ["HUMBUG_API_KEY"] = api_key os.environ["HUMBUG_API_KEY"] = api_key
humbug_account_email = options.user + "@mit.edu"
import humbug import humbug
humbug_client = humbug.Client( humbug_client = humbug.Client(
email=options.user + "@mit.edu", email=humbug_account_email,
api_key=api_key, api_key=api_key,
verbose=True, verbose=True,
client="zephyr_mirror", client="zephyr_mirror",