Page MenuHomePhabricator
Files F14046420

D15705.id37847.diff
No OneTemporary
Actions

D15705.id37847.diff
View Options

diff --git a/src/applications/notification/client/PhabricatorNotificationServerRef.php b/src/applications/notification/client/PhabricatorNotificationServerRef.php
--- a/src/applications/notification/client/PhabricatorNotificationServerRef.php
+++ b/src/applications/notification/client/PhabricatorNotificationServerRef.php
@@ -162,7 +162,7 @@
public function getWebsocketURI($to_path = null) {
$instance = PhabricatorEnv::getEnvConfig('cluster.instance');
if (strlen($instance)) {
- $to_path = $to_path.$instance.'/';
+ $to_path = $to_path.'~'.$instance.'/';
}
$uri = $this->getURI($to_path);
diff --git a/support/aphlict/server/lib/AphlictClientServer.js b/support/aphlict/server/lib/AphlictClientServer.js
--- a/support/aphlict/server/lib/AphlictClientServer.js
+++ b/support/aphlict/server/lib/AphlictClientServer.js
@@ -52,18 +52,33 @@
response.end('HTTP/501 Use Websockets\n');
},
+ _parseInstanceFromPath: function(path) {
+ // If there's no "~" marker in the path, it's not an instance name.
+ // Users sometimes configure nginx or Apache to proxy based on the
+ // path.
+ if (path.indexOf('~') === -1) {
+ return 'default';
+ }
+
+ var instance = path.split('~')[1];
+
+ // Remove any "/" characters.
+ instance = instance.replace(/\//g, '');
+ if (!instance.length) {
+ return 'default';
+ }
+
+ return instance;
+ },
+
listen: function() {
var self = this;
var server = this._server.listen.apply(this._server, arguments);
var wss = new WebSocket.Server({server: server});
wss.on('connection', function(ws) {
- var instance = url.parse(ws.upgradeReq.url).pathname;
-
- instance = instance.replace(/\//g, '');
- if (!instance.length) {
- instance = 'default';
- }
+ var path = url.parse(ws.upgradeReq.url).pathname;
+ var instance = self._parseInstanceFromPath(path);
var listener = self.getListenerList(instance).addListener(ws);

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 14, 9:06 PM (3 d, 4 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6739848
Default Alt Text
D15705.id37847.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility