libtransport.git Changeset - 091411eea4d9

Changeset - 091411eea4d9

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Jan Kaluza - 14 years ago 2011-06-27 16:57:14
hanzz.k@gmail.com

Show users in spectrum_manager status command

4 files changed with 19 insertions and 5 deletions:

include/transport/admininterface.h

include/transport/networkpluginserver.h

spectrum/src/main.cpp

src/admininterface.cpp

0 comments (0 inline, 0 general)

include/transport/admininterface.h

➞

Show inline comments

@@ @@ -19,27 +19,31 @@ @@
  */
 #pragma once
 #include <string>
 #include <map>
 #include "Swiften/Swiften.h"
 namespace Transport {
 class Component;
 class StorageBackend;
 class UserManager;
 class NetworkPluginServer;
 class AdminInterface {
 	public:
 		AdminInterface(Component *component, StorageBackend *storageBackend = NULL);
+		AdminInterface(Component *component, UserManager *userManager, NetworkPluginServer *server = NULL, StorageBackend *storageBackend = NULL);
 		~AdminInterface();
 	private:
 		void handleMessageReceived(Swift::Message::ref message);
 		Component *m_component;
 		StorageBackend *m_storageBackend;
 		UserManager *m_userManager;
 		NetworkPluginServer *m_server;
 };
+}

include/transport/networkpluginserver.h

➞

Show inline comments

@@ @@ -44,24 +44,28 @@ class NetworkPluginServer { @@
 	public:
 		struct Client {
 			bool pongReceived;
 			std::list<User *> users;
 			Swift::SafeByteArray data;
 			boost::shared_ptr<Swift::Connection> connection;
 		};
 		NetworkPluginServer(Component *component, Config *config, UserManager *userManager);
 		virtual ~NetworkPluginServer();
 		int getBackendCount() {
 			return m_clients.size();
+		}
 		void handleMessageReceived(NetworkConversation *conv, boost::shared_ptr<Swift::Message> &message);
 	private:
 		void handleNewClientConnection(boost::shared_ptr<Swift::Connection> c);
 		void handleSessionFinished(Client *c);
 		void handleDataRead(Client *c, const Swift::SafeByteArray&);
 		void handleConnectedPayload(const std::string &payload);
 		void handleDisconnectedPayload(const std::string &payload);
 		void handleBuddyChangedPayload(const std::string &payload);
 		void handleConvMessagePayload(const std::string &payload, bool subject = false);
 		void handleParticipantChangedPayload(const std::string &payload);

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -64,18 +64,18 @@ int main(int argc, char **argv) @@
 		if (!storageBackend->connect()) {
 			std::cerr << "Can't connect to database.\n";
+		}
+	}
 	UserManager userManager(&transport, storageBackend);
 	if (storageBackend) {
 		UserRegistration userRegistration(&transport, &userManager, storageBackend);
 		logger.setUserRegistration(&userRegistration);
+	}
 	logger.setUserManager(&userManager);
 	AdminInterface adminInterface(&transport, storageBackend);
 	NetworkPluginServer plugin(&transport, &config, &userManager);
 	AdminInterface adminInterface(&transport, &userManager, &plugin, storageBackend);
 	eventLoop.run();
+}

src/admininterface.cpp

➞

Show inline comments

@@ @@ -15,55 +15,61 @@ @@
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "transport/admininterface.h"
 #include "transport/user.h"
 #include "transport/transport.h"
 #include "transport/storagebackend.h"
 #include "transport/conversationmanager.h"
 #include "transport/rostermanager.h"
 #include "transport/usermanager.h"
 #include "transport/networkpluginserver.h"
 #include "storageresponder.h"
 #include "log4cxx/logger.h"
 using namespace log4cxx;
 namespace Transport {
 static LoggerPtr logger = Logger::getLogger("AdminInterface");
 AdminInterface::AdminInterface(Component *component, StorageBackend *storageBackend) {
+AdminInterface::AdminInterface(Component *component, UserManager *userManager, NetworkPluginServer *server, StorageBackend *storageBackend) {
 	m_component = component;
 	m_storageBackend = storageBackend;
 	m_userManager = userManager;
 	m_server = server;
 	m_component->getStanzaChannel()->onMessageReceived.connect(bind(&AdminInterface::handleMessageReceived, this, _1));
+}
 AdminInterface::~AdminInterface() {
+}
 void AdminInterface::handleMessageReceived(Swift::Message::ref message) {
 	if (!message->getTo().getNode().empty())
 		return;
 	if (message->getFrom().getNode() != CONFIG_STRING(m_component->getConfig(), "service.admin_username")) {
 		LOG4CXX_WARN(logger, "Message not from admin user, but from " << message->getFrom().getNode());
 		return;
+	}
 	LOG4CXX_INFO(logger, "Message from admin received");
 	message->setTo(message->getFrom());
 	message->setFrom(m_component->getJID());
 	if (message->getBody() == "status") {
 		message->setBody("Running");
 		int users = m_userManager->getUserCount();
 		int backends = m_server->getBackendCount() - 1;
 		message->setBody("Running (" + boost::lexical_cast<std::string>(users) + " users connected using " + boost::lexical_cast<std::string>(backends) + " backends)");
+	}
 	else {
 		message->setBody("Unknown command");
+	}
 	m_component->getStanzaChannel()->sendMessage(message);
+}
+}

0 comments (0 inline, 0 general)