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

Add an options to set jabber server details

Browse source 
--jabber-server-address=JABBER_SERVER_ADDRESS
                    The hostname of your Jabber server
--jabber-server-port=JABBER_SERVER_PORT
                    The port of your Jabber server

(imported from commit f6b73ce6a2e3dcdbb100a1b6aba5ad89fc99a457)
This commit is contained in:
Jason Michalski 2014-07-17 18:52:29 -04:00 committed by Waseem Daher
parent 700e744690
commit 1d649fe611
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
bots/jabber_mirror_backend.py
View file

@ -351,6 +351,16 @@ option does not affect login credentials.'''.replace("\n", " "))
jabber_group.add_option('--no-use-tls', jabber_group.add_option('--no-use-tls',
default=None, default=None,
action='store_true') action='store_true')
jabber_group.add_option('--jabber-server-address',
default=None,
action='store',
help="The hostname of your Jabber server. This is only needed if "
"your server is missing SRV records")
jabber_group.add_option('--jabber-server-port',
default='5222',
action='store',
help="The port of your Jabber server. This is only needed if "
"your server is missing SRV records")
parser.add_option_group(jabber_group) parser.add_option_group(jabber_group)
parser.add_option_group(zulip.generate_option_group(parser, "zulip-")) parser.add_option_group(zulip.generate_option_group(parser, "zulip-"))
@ -370,7 +380,7 @@ option does not affect login credentials.'''.replace("\n", " "))
config.readfp(f, config_file) config.readfp(f, config_file)
except IOError: except IOError:
pass pass
for option in ("jid", "jabber_password", "conference_domain", "mode", "zulip_email_suffix"): for option in ("jid", "jabber_password", "conference_domain", "mode", "zulip_email_suffix", "jabber_server_address", "jabber_server_port"):
if (getattr(options, option) is None if (getattr(options, option) is None
and config.has_option("jabber_mirror", option)): and config.has_option("jabber_mirror", option)):
setattr(options, option, config.get("jabber_mirror", option)) setattr(options, option, config.get("jabber_mirror", option))
@ -409,7 +419,11 @@ option does not affect login credentials.'''.replace("\n", " "))
xmpp = JabberToZulipBot(jid, options.jabber_password, get_rooms(zulip)) xmpp = JabberToZulipBot(jid, options.jabber_password, get_rooms(zulip))
if not xmpp.connect(use_tls=not options.no_use_tls): address = None
if options.jabber_server_address:
address = (options.jabber_server_address, options.jabber_server_port)
if not xmpp.connect(use_tls=not options.no_use_tls, address=address):
sys.exit("Unable to connect to Jabber server") sys.exit("Unable to connect to Jabber server")
xmpp.set_zulip_client(zulip) xmpp.set_zulip_client(zulip)