Make port and server config vars

[bzrirker.git] / irkerhook.py

diff --git a/irkerhook.py b/irkerhook.py
index d58b194ef6290f8a9375017f0567d7675971263c..b18763a6dfbe19e4953e1a82375584f6b41f416a 100644 (file)
--- 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."""
@@ -15,13 +17,12 @@ class IrkerSender(object):
     def __init__(self, branch, revision_id, config):
         self.config = config
         self.branch = branch
-        self.repository = branch.repository
         self._revision_id = revision_id
         self.revision = None
         self.revno = None
 
     def _setup_revision_and_revno(self):
-        self.revision = self.repository.get_revision(self._revision_id)
+        self.revision = self.branch.repository.get_revision(self._revision_id)
         self.revno = self.branch.revision_id_to_revno(self._revision_id)
 
     def _format(self):
@@ -99,10 +100,13 @@ class IrkerSender(object):
         """Send the info to irkerd.
         """
         self.branch.lock_read()
-        self.repository.lock_read()
-        # These should become configurable at some point
-        default_server = 'localhost'
-        IRKER_PORT = 6659
+        self.branch.repository.lock_read()
+        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()
@@ -118,14 +122,14 @@ 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)
                 finally:
                     sock.close()
         finally:
-            self.repository.unlock()
+            self.branch.repository.unlock()
             self.branch.unlock()
 
 opt_irker_channels = Option('irker_channels',
@@ -134,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)