GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Some changes required from Orbited debugging

Browse Source
This commit is contained in:
Evan Prodromou 2009-10-04 04:05:40 -04:00
parent 035978270d
commit 27ff66c9de
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/Orbited/OrbitedPlugin.php
View File

@ -60,6 +60,12 @@ class OrbitedPlugin extends RealtimePlugin
protected $con = null; protected $con = null;
function onStartShowHeadElements($action)
{
// See http://orbited.org/wiki/Deployment#Cross-SubdomainDeployment
$action->element('script', null, ' document.domain = document.domain; ');
}
function _getScripts() function _getScripts()
{ {
$scripts = parent::_getScripts(); $scripts = parent::_getScripts();
@ -71,6 +77,7 @@ class OrbitedPlugin extends RealtimePlugin
$root = 'http://'.$server.(($port == 80) ? '':':'.$port); $root = 'http://'.$server.(($port == 80) ? '':':'.$port);
$scripts[] = $root.'/static/Orbited.js'; $scripts[] = $root.'/static/Orbited.js';
$scripts[] = common_path('plugins/Orbited/orbitedextra.js');
$scripts[] = $root.'/static/protocols/stomp/stomp.js'; $scripts[] = $root.'/static/protocols/stomp/stomp.js';
$scripts[] = common_path('plugins/Orbited/orbitedupdater.js'); $scripts[] = common_path('plugins/Orbited/orbitedupdater.js');
@ -90,16 +97,16 @@ class OrbitedPlugin extends RealtimePlugin
function _connect() function _connect()
{ {
require_once(INSTALLDIR.'/extlibs/Stomp.php'); require_once(INSTALLDIR.'/extlib/Stomp.php');
$url = $this->_getStompUrl(); $url = $this->_getStompUrl();
$this->con = new Stomp($url); $this->con = new Stomp($url);
if ($this->con->connect($this->username, $this->password)) { if ($this->con->connect($this->username, $this->password)) {
$this->_log(LOG_INFO, "Connected."); $this->log(LOG_INFO, "Connected.");
} else { } 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'); throw new ServerException('Failed to connect to queue server');
} }
} }
@ -128,15 +135,14 @@ class OrbitedPlugin extends RealtimePlugin
function _getStompServer() function _getStompServer()
{ {
$server = (!is_null($this->stompserver)) ? $this->stompserver : return (!is_null($this->stompserver)) ? $this->stompserver :
(!is_null($this->webserver)) ? $this->webserver : (!is_null($this->webserver)) ? $this->webserver :
common_config('site', 'server'); common_config('site', 'server');
return $server;
} }
function _getStompPort() function _getStompPort()
{ {
$port = (!is_null($this->stompport)) ? $this->stompport : 61613; return (!is_null($this->stompport)) ? $this->stompport : 61613;
} }
function _getStompUrl() function _getStompUrl()

2
plugins/Orbited/orbitedextra.js Normal file
View File

@ -0,0 +1,2 @@
TCPSocket = Orbited.TCPSocket;

11
plugins/Orbited/orbitedupdater.js
View File

@ -9,13 +9,16 @@ var OrbitedUpdater = function()
// set up stomp client. // set up stomp client.
stomp = new STOMPClient(); stomp = new STOMPClient();
stomp.connect(server, port, username, password);
stomp.subscribe(timeline);
stomp.onmessageframe = function(frame) { stomp.onmessageframe = function(frame) {
RealtimeUpdate.receive(JSON.parse(frame.body)); RealtimeUpdate.receive(JSON.parse(frame.body));
}; };
};
stomp.onconnectedframe = function() {
stomp.subscribe(timeline);
}
stomp.connect(server, port, username, password);
}
} }
}(); }();