summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-10-04 04:05:40 -0400
committerEvan Prodromou <evan@status.net>2009-10-04 04:05:40 -0400
commit27ff66c9de64a60cb3219f6d823cb290d4f18c01 (patch)
tree48305718abdf01a325ce92622cf74fd6cd7c1863
parent035978270d609b650b8e32f252366e0e75b12507 (diff)
Some changes required from Orbited debugging
-rw-r--r--plugins/Orbited/OrbitedPlugin.php18
-rw-r--r--plugins/Orbited/orbitedextra.js2
-rw-r--r--plugins/Orbited/orbitedupdater.js11
3 files changed, 21 insertions, 10 deletions
diff --git a/plugins/Orbited/OrbitedPlugin.php b/plugins/Orbited/OrbitedPlugin.php
index ad7d1d276..ba87b266a 100644
--- a/plugins/Orbited/OrbitedPlugin.php
+++ b/plugins/Orbited/OrbitedPlugin.php
@@ -60,6 +60,12 @@ class OrbitedPlugin extends RealtimePlugin
protected $con = null;
+ function onStartShowHeadElements($action)
+ {
+ // See http://orbited.org/wiki/Deployment#Cross-SubdomainDeployment
+ $action->element('script', null, ' document.domain = document.domain; ');
+ }
+
function _getScripts()
{
$scripts = parent::_getScripts();
@@ -71,6 +77,7 @@ class OrbitedPlugin extends RealtimePlugin
$root = 'http://'.$server.(($port == 80) ? '':':'.$port);
$scripts[] = $root.'/static/Orbited.js';
+ $scripts[] = common_path('plugins/Orbited/orbitedextra.js');
$scripts[] = $root.'/static/protocols/stomp/stomp.js';
$scripts[] = common_path('plugins/Orbited/orbitedupdater.js');
@@ -90,16 +97,16 @@ class OrbitedPlugin extends RealtimePlugin
function _connect()
{
- require_once(INSTALLDIR.'/extlibs/Stomp.php');
+ require_once(INSTALLDIR.'/extlib/Stomp.php');
$url = $this->_getStompUrl();
$this->con = new Stomp($url);
if ($this->con->connect($this->username, $this->password)) {
- $this->_log(LOG_INFO, "Connected.");
+ $this->log(LOG_INFO, "Connected.");
} else {
- $this->_log(LOG_ERR, 'Failed to connect to queue server');
+ $this->log(LOG_ERR, 'Failed to connect to queue server');
throw new ServerException('Failed to connect to queue server');
}
}
@@ -128,15 +135,14 @@ class OrbitedPlugin extends RealtimePlugin
function _getStompServer()
{
- $server = (!is_null($this->stompserver)) ? $this->stompserver :
+ return (!is_null($this->stompserver)) ? $this->stompserver :
(!is_null($this->webserver)) ? $this->webserver :
common_config('site', 'server');
- return $server;
}
function _getStompPort()
{
- $port = (!is_null($this->stompport)) ? $this->stompport : 61613;
+ return (!is_null($this->stompport)) ? $this->stompport : 61613;
}
function _getStompUrl()
diff --git a/plugins/Orbited/orbitedextra.js b/plugins/Orbited/orbitedextra.js
new file mode 100644
index 000000000..47e5c0c80
--- /dev/null
+++ b/plugins/Orbited/orbitedextra.js
@@ -0,0 +1,2 @@
+TCPSocket = Orbited.TCPSocket;
+
diff --git a/plugins/Orbited/orbitedupdater.js b/plugins/Orbited/orbitedupdater.js
index d70f4a4fd..8c5ab3b73 100644
--- a/plugins/Orbited/orbitedupdater.js
+++ b/plugins/Orbited/orbitedupdater.js
@@ -9,13 +9,16 @@ var OrbitedUpdater = function()
// set up stomp client.
stomp = new STOMPClient();
- stomp.connect(server, port, username, password);
- stomp.subscribe(timeline);
-
stomp.onmessageframe = function(frame) {
RealtimeUpdate.receive(JSON.parse(frame.body));
};
- };
+
+ stomp.onconnectedframe = function() {
+ stomp.subscribe(timeline);
+ }
+
+ stomp.connect(server, port, username, password);
+ }
}
}();