[TASK] Code cleanup and some small documentation.

This commit is contained in:
Jan Philipp Timme 2010-11-28 16:51:43 +00:00
parent a20a91bf12
commit db9dda856c
7 changed files with 24 additions and 9 deletions

View File

@ -7,10 +7,7 @@
- Logging auf Verbindungs/Channel und Verbindung/Query-Basis für IRC. - Logging auf Verbindungs/Channel und Verbindung/Query-Basis für IRC.
- RAW-Logging für den Rest? - RAW-Logging für den Rest?
- Settings?! "<Serena> I'll ask Lucene about that ;-)" -> Logfiles durchsuchen nach nick, zeit,...
"<Serena> I'll ask Lucene about that ;-)"
- Logging mit Timestamp für: - Logging mit Timestamp für:
- Sollte das Teil mal abkacken, so will ich zumindest über Verbindungsabbrüche, - Sollte das Teil mal abkacken, so will ich zumindest über Verbindungsabbrüche,

View File

@ -90,8 +90,8 @@ class Client_ClientManager {
//assign the client to the new connectionHandler. //assign the client to the new connectionHandler.
$this->clientPool[$newConnectionHandler->getID()] = $client; $this->clientPool[$newConnectionHandler->getID()] = $client;
//get the config and assign it to the new connectionHandler, too. //get the config and assign it to the new connectionHandler, too.
$config = $this->configPool[$connectionHandler->getID()]; $config = $this->configPool[$connectionHandler->getID()];
$this->configPool[$newConnectionHandler->getID()] = $config; $this->configPool[$newConnectionHandler->getID()] = $config;
//remove old connection //remove old connection
$this->removeConnection($connectionHandler); $this->removeConnection($connectionHandler);
} }
@ -109,7 +109,7 @@ class Client_ClientManager {
} }
//call the registered client //call the registered client
if(isset($this->clientPool[$connectionHandler->getID()])) { if(isset($this->clientPool[$connectionHandler->getID()])) {
//let the client process the data, send the results back. //let the client process the data, send the results back.
while($data = $connectionHandler->read()) { while($data = $connectionHandler->read()) {
$result = $this->clientPool[$connectionHandler->getID()]->processRawData($data); $result = $this->clientPool[$connectionHandler->getID()]->processRawData($data);
if($result !== "") { if($result !== "") {

View File

@ -111,7 +111,7 @@ class Connection_ConnectionPool {
if($connectionHandler->canWrite() && $connectionHandler->isServer() === FALSE) $write[] = $connectionSocket; if($connectionHandler->canWrite() && $connectionHandler->isServer() === FALSE) $write[] = $connectionSocket;
} }
$except = $read; $except = $read;
//Arrays are prepared, let's have socket_select() take a look and process its results.
$tempArray = array(); $tempArray = array();
$selectedSockets = $this->socketPool->select($read, $write, $except); $selectedSockets = $this->socketPool->select($read, $write, $except);
foreach($selectedSockets AS $selectedType=>$selectedArray) { //read, write, except, this loop won't kill performance foreach($selectedSockets AS $selectedType=>$selectedArray) { //read, write, except, this loop won't kill performance

View File

@ -3,7 +3,6 @@ error_reporting(E_ALL);
require_once('AutoLoader.php'); require_once('AutoLoader.php');
try { try {
//require_once('Testcode/Connection/IrcClientTest.php');
require_once('Testcode/Client/ClientManagerTest.php'); require_once('Testcode/Client/ClientManagerTest.php');
} }
catch(Exception $e) { catch(Exception $e) {

17
README Normal file
View File

@ -0,0 +1,17 @@
# General
This multiserver-ircbot is based on an advanced socket-driven framework.
It's still in beta, but the basics are working.
# Running the bot
To run it, simply type ./start.sh into your console.
# Documentation
The documentation is not in the svn, but you can easily create it using the existing Doxyfile with doxygen.
Simply run ./update-docs.sh and - if doxygen + dot are installed - you'll have a perfectly fine documentation.
The Code itself should also give you an idea of how this works :-)
# License
This project is a private one, i don't know what license i will use yet.

View File

@ -1 +1,2 @@
#!/bin/bash
clear && php Main.php clear && php Main.php

View File

@ -1 +1,2 @@
#!/bin/bash
doxygen doxygen