From 3d9dd4563587c37a53d93ba2e37600ed2d7f3e6f Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@joshuaspence.com>
Date: Tue, 13 Jan 2015 06:38:39 +1100
Subject: [PATCH] Allow Aphlict client port to be overridden

Summary: In my use case, I have `notification.client-uri` set to `https://phabricator.example.com/ws/` (which routes to `nginx`) but I need `aphlict` to listen to port `22280`.

Test Plan: Tested in our install.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D11337
---
 .../PhabricatorAphlictManagementWorkflow.php          | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/applications/aphlict/management/PhabricatorAphlictManagementWorkflow.php b/src/applications/aphlict/management/PhabricatorAphlictManagementWorkflow.php
index 59ba40b8a4..34616b18cd 100644
--- a/src/applications/aphlict/management/PhabricatorAphlictManagementWorkflow.php
+++ b/src/applications/aphlict/management/PhabricatorAphlictManagementWorkflow.php
@@ -5,6 +5,7 @@ abstract class PhabricatorAphlictManagementWorkflow
 
   private $debug = false;
   private $clientHost;
+  private $clientPort;
 
   public function didConstruct() {
     $this
@@ -15,11 +16,17 @@ abstract class PhabricatorAphlictManagementWorkflow
             'param' => 'hostname',
             'help'  => pht('Hostname to bind to for the client server.'),
           ),
+          array(
+            'name'  => 'client-port',
+            'param' => 'port',
+            'help'  => pht('Port to bind to for the client server.'),
+          ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $this->clientHost = $args->getArg('client-host');
+    $this->clientPort = $args->getArg('client-port');
     return 0;
   }
 
@@ -124,7 +131,9 @@ abstract class PhabricatorAphlictManagementWorkflow
     $log = PhabricatorEnv::getEnvConfig('notification.log');
 
     $server_argv = array();
-    $server_argv[] = '--client-port='.$client_uri->getPort();
+    $server_argv[] = '--client-port='.coalesce(
+      $this->clientPort,
+      $client_uri->getPort());
     $server_argv[] = '--admin-port='.$server_uri->getPort();
     $server_argv[] = '--admin-host='.$server_uri->getDomain();