From 5928aa94fa0f47d0e9860afd8431c34200ecc55e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaussoin=20Timoth=C3=A9e?= Date: Sun, 17 May 2015 22:41:01 +0200 Subject: [PATCH] - Test the database before launching the daemon - Remove all the XMPP websocket occurences --- app/models/config/Config.php | 4 --- app/models/config/ConfigDAO.php | 6 ----- app/models/sessionx/Sessionx.php | 3 --- app/models/sessionx/SessionxDAO.php | 5 ---- app/widgets/AdminMain/adminmain.tpl | 38 ----------------------------- daemon.php | 15 ++++++++++++ linker.php | 13 ++-------- system/Sessionx.php | 8 ------ 8 files changed, 17 insertions(+), 75 deletions(-) diff --git a/app/models/config/Config.php b/app/models/config/Config.php index 3c890b668..1c283d680 100755 --- a/app/models/config/Config.php +++ b/app/models/config/Config.php @@ -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; diff --git a/app/models/config/ConfigDAO.php b/app/models/config/ConfigDAO.php index b008695d7..2056503c0 100755 --- a/app/models/config/ConfigDAO.php +++ b/app/models/config/ConfigDAO.php @@ -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, diff --git a/app/models/sessionx/Sessionx.php b/app/models/sessionx/Sessionx.php index 8388042e6..cc49de69b 100755 --- a/app/models/sessionx/Sessionx.php +++ b/app/models/sessionx/Sessionx.php @@ -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" : diff --git a/app/models/sessionx/SessionxDAO.php b/app/models/sessionx/SessionxDAO.php index 26466973b..3130d1a5e 100755 --- a/app/models/sessionx/SessionxDAO.php +++ b/app/models/sessionx/SessionxDAO.php @@ -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, diff --git a/app/widgets/AdminMain/adminmain.tpl b/app/widgets/AdminMain/adminmain.tpl index 47cfcf4d5..2d67f75ce 100755 --- a/app/widgets/AdminMain/adminmain.tpl +++ b/app/widgets/AdminMain/adminmain.tpl @@ -76,44 +76,6 @@
-

{$c->__('websocket.title')}

- - - -
- - -
- - {if="isset($websockets)"} -
- - -
- {loop="$websockets->websockets"} -
{$value->name}
-
{$value->url}
- {/loop} -
-
- {/if} - -

{$c->__('whitelist.title')}

diff --git a/daemon.php b/daemon.php index d4d00c300..008c131e2 100755 --- a/daemon.php +++ b/daemon.php @@ -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)); diff --git a/linker.php b/linker.php index c29ad404e..70ee01326 100755 --- a/linker.php +++ b/linker.php @@ -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"); } } diff --git a/system/Sessionx.php b/system/Sessionx.php index 542211752..89b821dca 100755 --- a/system/Sessionx.php +++ b/system/Sessionx.php @@ -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',