X-Git-Url: https://git.ctpug.org.za/?p=bzrirker.git;a=blobdiff_plain;f=irkerhook.py;fp=irkerhook.py;h=b18763a6dfbe19e4953e1a82375584f6b41f416a;hp=4eecd2144eb2bdfa40567757112dd3e46db1a602;hb=3ad4340dea8ee06a11c02d89c5847c516cfc5862;hpb=fbf251de0ad945d3b25bcd991af64f6836d3ece1 diff --git a/irkerhook.py b/irkerhook.py index 4eecd21..b18763a 100644 --- a/irkerhook.py +++ b/irkerhook.py @@ -8,6 +8,8 @@ import socket import sys import json +IRKER_PORT = 6659 + class IrkerSender(object): """An irker message sender.""" @@ -99,9 +101,12 @@ class IrkerSender(object): """ self.branch.lock_read() self.branch.repository.lock_read() - # These should become configurable at some point - default_server = 'localhost' - IRKER_PORT = 6659 + server = self.config.get('irker_server') + if not server: + server = 'localhost' + port = self.config.get('irker_port') + if not port: + port = IRKER_PORT try: # Do this after we have locked, to make things faster. self._setup_revision_and_revno() @@ -117,7 +122,7 @@ class IrkerSender(object): # of irker's code try: sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - sock.connect((default_server, IRKER_PORT)) + sock.connect((server, port)) sock.sendall(message + "\n") except socket.error, e: sys.stderr.write("%s\n" % e) @@ -133,3 +138,7 @@ opt_irker_colours = Option('irker_colours', help='Colour option for irker.') opt_irker_project = Option('irker_project', help='Project name to use.') +opt_irker_server = Option('irker_server', + help='host for the irkerd server (default localhost).') +opt_irker_port = Option('irker_port', + help='port for the irkerd server (default %d)' % IRKER_PORT)