xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

log2zulip: Use default argparser.

Browse source
This commit is contained in:
derAnfaenger 2017-09-01 11:05:53 +02:00 committed by Tim Abbott
parent 3af373adc3
commit 761d4f44c1
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
zulip/integrations/log2zulip/log2zulip
View file

@ -1,6 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
from __future__ import print_function from __future__ import print_function
import argparse
import errno import errno
import os import os
import platform import platform
@ -24,7 +25,6 @@ import zulip
from typing import List from typing import List
lock_path = "/var/tmp/log2zulip.lock" lock_path = "/var/tmp/log2zulip.lock"
control_path = "/etc/log2zulip.conf"
def mkdir_p(path): def mkdir_p(path):
# type: (str) -> None # type: (str) -> None
@ -96,17 +96,24 @@ def process_logs():
open(data_file_path, "w").write(json.dumps(new_data)) open(data_file_path, "w").write(json.dumps(new_data))
if __name__ == "__main__": if __name__ == "__main__":
parser = zulip.add_default_arguments(argparse.ArgumentParser()) # type: argparse.ArgumentParser3
parser.add_argument("--control-path", default="/etc/log2zulip.conf")
args = parser.parse_args()
# On posix systems, we set the config directory explicitly for legacy reasons.
if not args.zulip_config_file and os.name == "posix":
args.zulip_config_file = "/etc/log2zulip.zuliprc"
if os.path.exists(lock_path): if os.path.exists(lock_path):
print("Log2zulip lock held; not doing anything") print("Log2zulip lock held; not doing anything")
sys.exit(0) sys.exit(0)
try: try:
open(lock_path, "w").write("1") open(lock_path, "w").write("1")
zulip_client = zulip.Client(config_file="/etc/log2zulip.zuliprc") zulip_client = zulip.init_from_options(args)
try: try:
log_files = json.loads(open(control_path, "r").read()) log_files = json.loads(open(args.control_path, "r").read())
except (json.JSONDecodeError, IOError): except (json.JSONDecodeError, IOError):
print("Could not load control data from %s" % (control_path,)) print("Could not load control data from %s" % (args.control_path,))
traceback.print_exc() traceback.print_exc()
sys.exit(1) sys.exit(1)
process_logs() process_logs()