Mirrors
/
movim
mirror of https://github.com/movim/movim
3
0
Fork 0
Code Releases Activity
Browse Source

- Test the database before launching the daemon 

- Remove all the XMPP websocket occurences
pull/16/head
Jaussoin Timothée 11 years ago
parent
8d25cf406e
commit
5928aa94fa
8 changed files with 17 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/models/config/Config.php
  2. 6
      app/models/config/ConfigDAO.php
  3. 3
      app/models/sessionx/Sessionx.php
  4. 5
      app/models/sessionx/SessionxDAO.php
  5. 38
      app/widgets/AdminMain/adminmain.tpl
  6. 15
      daemon.php
  7. 13
      linker.php
  8. 8
      system/Sessionx.php

4
app/models/config/Config.php
View File

@ -10,7 +10,6 @@ class Config extends Model {
public $maxusers;
public $loglevel;
public $timezone;
public $websocketurl;
public $xmppwhitelist;
public $info;
public $unregister;
@ -36,8 +35,6 @@ class Config extends Model {
{"type":"string", "size":16, "mandatory":true },
"timezone" :
{"type":"string", "size":16, "mandatory":true },
"websocketurl" :
{"type":"string", "size":128, "mandatory":true },
"xmppwhitelist" :
{"type":"text" },
"info" :
@ -63,7 +60,6 @@ class Config extends Model {
$this->maxusers = -1;
$this->loglevel = 'empty';
$this->timezone = 'Etc/GMT';
$this->websocketurl = 'ws://localhost:5280';
$this->xmppwhitelist = '';
$this->info = '';
$this->unregister = false;

6
app/models/config/ConfigDAO.php
View File

@ -4,7 +4,6 @@ namespace Modl;
class ConfigDAO extends SQL {
function set(Config $c) {
\movim_log('hop');
$this->_sql = '
update config
set environment = :environment,
@ -14,7 +13,6 @@ class ConfigDAO extends SQL {
maxusers = :maxusers,
loglevel = :loglevel,
timezone = :timezone,
websocketurl = :websocketurl,
xmppwhitelist = :xmppwhitelist,
info = :info,
unregister = :unregister,
@ -33,7 +31,6 @@ class ConfigDAO extends SQL {
'maxusers' => $c->maxusers,
'loglevel' => $c->loglevel,
'timezone' => $c->timezone,
'websocketurl' => $c->websocketurl,
'xmppwhitelist'=> $c->xmppwhitelist,
'info' => $c->info,
'unregister' => $c->unregister,
@ -68,7 +65,6 @@ class ConfigDAO extends SQL {
maxusers,
loglevel,
timezone,
websocketurl,
xmppwhitelist,
info,
unregister,
@ -86,7 +82,6 @@ class ConfigDAO extends SQL {
:maxusers,
:loglevel,
:timezone,
:websocketurl,
:xmppwhitelist,
:info,
:unregister,
@ -107,7 +102,6 @@ class ConfigDAO extends SQL {
'maxusers' => $c->maxusers,
'loglevel' => $c->loglevel,
'timezone' => $c->timezone,
'websocketurl' => $c->websocketurl,
'xmppwhitelist'=> $c->xmppwhitelist,
'info' => $c->info,
'unregister' => $c->unregister,

3
app/models/sessionx/Sessionx.php
View File

@ -11,7 +11,6 @@ class Sessionx extends Model {
public $rid;
public $sid;
public $id;
public $url;
public $port;
public $host;
public $domain;
@ -40,8 +39,6 @@ class Sessionx extends Model {
{"type":"string", "size":64 },
"id" :
{"type":"int", "size":8, "mandatory":true },
"url" :
{"type":"string", "size":128, "mandatory":true },
"port" :
{"type":"int", "size":5, "mandatory":true },
"host" :

5
app/models/sessionx/SessionxDAO.php
View File

@ -13,7 +13,6 @@ class SessionxDAO extends SQL {
rid = :rid,
sid = :sid,
id = :id,
url = :url,
port = :port,
host = :host,
domain = :domain,
@ -35,7 +34,6 @@ class SessionxDAO extends SQL {
'rid' => $s->rid,
'sid' => $s->sid,
'id' => $s->id,
'url' => $s->url,
'port' => $s->port,
'host' => $s->host,
'domain' => $s->domain,
@ -60,7 +58,6 @@ class SessionxDAO extends SQL {
rid,
sid,
id,
url,
port,
host,
domain,
@ -78,7 +75,6 @@ class SessionxDAO extends SQL {
:rid,
:sid,
:id,
:url,
:port,
:host,
:domain,
@ -99,7 +95,6 @@ class SessionxDAO extends SQL {
'rid' => $s->rid,
'sid' => $s->sid,
'id' => $s->id,
'url' => $s->url,
'port' => $s->port,
'host' => $s->host,
'domain' => $s->domain,

38
app/widgets/AdminMain/adminmain.tpl
View File

@ -76,44 +76,6 @@
</div>
<br />
<h3>{$c->__('websocket.title')}</h3>
<!--{if="!$c->testBosh($conf->boshurl)"}
<div class="message error">
{$c->__('bosh.not_recheable')}
</div>
{/if}-->
<div>
<input type="text" id="websocketurl" name="websocketurl" placeholder="{$c->__('websocket.label')}" value="{$conf->websocketurl}"/>
<label for="websocketurl">{$c->__('websocket.label')}</label>
</div>
{if="isset($websockets)"}
<div class="element simple">
<label for="websocketurl">
{$c->__('websocket.publics')} -
<a target="_blank" href="https://api.movim.eu/">Movim API</a>
</label>
<dl>
{loop="$websockets->websockets"}
<dt>{$value->name}</dt>
<dd>{$value->url}</dd>
{/loop}
</dl>
</div>
{/if}
<ul class="thick">
<li class="condensed">
<span class="icon bubble color orange">
<i class="md md-warning"></i>
</span>
<span>{$c->__('websocket.info')}: <code>ws(s)://domain:port</code></span>
<p>{$c->__('websocket.save_info')}</p>
</li>
</ul>
<h3>{$c->__('whitelist.title')}</h3>

15
daemon.php
View File

@ -24,6 +24,21 @@ if($argsize == 2) {
exit;
}
$md = Modl\Modl::getInstance();
$infos = $md->check();
if($infos != null) {
echo colorize("The database need to be updated before running the daemon\n", 'green');
foreach($infos as $i) {
echo colorize($i."\n", 'blue');
}
echo colorize("\nTo update the database run\n", 'green');
echo colorize("php mud.php db set\n", 'purple');
break;
}
$loop = \React\EventLoop\Factory::create();
$core = new Core($loop, $argv[1], $argv[2]);
$app = new HttpServer(new WsServer($core));

13
linker.php
View File

@ -15,7 +15,6 @@ $dnsResolverFactory = new React\Dns\Resolver\Factory();
$dns = $dnsResolverFactory->createCached('8.8.8.8', $loop);
$connector = new React\SocketClient\Connector($loop, $dns);
//$connector = new Ratchet\Client\Factory($loop);
$stdin = new React\Stream\Stream(STDIN, $loop);
fwrite(STDERR, colorize(getenv('sid'), 'yellow')." widgets before : ".\sizeToCleanSize(memory_get_usage())."\n");
@ -32,8 +31,7 @@ $parser = new \Moxl\Parser;
$buffer = '';
$stdin_behaviour = function ($data) use (&$conn, $loop, &$buffer, &$connector, &$xmpp_behaviour, &$parser) {
//if(!isset($buffer)) $buffer = '';
$stdin_behaviour = function ($data) use (&$conn, $loop, &$buffer, &$connector, &$xmpp_behaviour, &$parser) {
if(substr($data, -1) == "") {
$messages = explode("", $buffer . substr($data, 0, -1));
$buffer = '';
@ -55,7 +53,6 @@ $stdin_behaviour = function ($data) use (&$conn, $loop, &$buffer, &$connector, &
$domain = \Moxl\Utils::getDomain($msg->host);
#fwrite(STDERR, colorize('open a socket to '.$domain, 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
$connector->create($domain, 5222)->then($xmpp_behaviour);
//$connector($config->websocketurl, array('xmpp'))->then($xmpp_behaviour);
}
} else {
return;
@ -79,7 +76,6 @@ $stdin_behaviour = function ($data) use (&$conn, $loop, &$buffer, &$connector, &
if(!empty($xml) && $conn) {
$conn->write(trim($xml));
//$conn->send(trim($xml));
#fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
}
}
@ -91,7 +87,6 @@ $stdin_behaviour = function ($data) use (&$conn, $loop, &$buffer, &$connector, &
};
$xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$stdin, $stdin_behaviour, $parser) {
//$xmpp_behaviour = function (Ratchet\Client\WebSocket $stream) use (&$conn, $loop, &$stdin, $stdin_behaviour, $parser) {
$conn = $stream;
fwrite(STDERR, colorize(getenv('sid'), 'yellow')." : ".colorize('linker launched', 'blue')."\n");
fwrite(STDERR, colorize(getenv('sid'), 'yellow')." launched : ".\sizeToCleanSize(memory_get_usage())."\n");
@ -101,8 +96,7 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
// We define a huge buffer to prevent issues with SSL streams, see https://bugs.php.net/bug.php?id=65137
$conn->bufferSize = 1024*32;
//$conn->on('message', function($message) use (&$conn, $loop, $parser, $stream) {
$conn->on('data', function($message) use (&$conn, $loop, $parser/*, $stream*/) {
$conn->on('data', function($message) use (&$conn, $loop, $parser) {
if(!empty($message)) {
$restart = false;
@ -127,8 +121,6 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
fwrite(STDERR, colorize(getenv('sid'), 'yellow')." ".$parser->getError()."\n");
}
//\Moxl\Xec\Handler::handleStanza($message);
if($restart) {
$session = \Sessionx::start();
\Moxl\Stanza\Stream::init($session->host);
@ -148,7 +140,6 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
if(!empty($xml)) {
$conn->write(trim($xml));
//$conn->send(trim($xml));
#fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
}
}

8
system/Sessionx.php
View File

@ -32,7 +32,6 @@ class Sessionx {
private $_resource;
private $_hash;
private $_sid;
private $_url;
private $_port;
private $_host;
private $_domain;
@ -86,7 +85,6 @@ class Sessionx {
$s->rid = $this->_rid;
$s->sid = $this->_sid;
$s->id = $this->_id;
$s->url = $this->_url;
$s->port = $this->_port;
$s->host = $this->_host;
$s->domain = $this->_domain;
@ -99,10 +97,6 @@ class Sessionx {
}
public function init($user, $pass, $host, $domain) {
$cd = new \Modl\ConfigDAO();
$config = $cd->get();
$this->_url = $config->websocketurl;
$this->_port = 5222;
$this->_host = $host;
$this->_domain = $domain;
@ -131,7 +125,6 @@ class Sessionx {
$this->_rid = $session->rid;
$this->_sid = $session->sid;
$this->_id = $session->id;
$this->_url = $session->url;
$this->_port = $session->port;
$this->_host = $session->host;
$this->_domain = $session->domain;
@ -155,7 +148,6 @@ class Sessionx {
in_array(
$key,
array(
'url',
'port',
'id',
'host',

Write Preview
Loading…
Cancel
Save