Changeset - ad49c6f5676f
Parent rev.
Child rev.
[Not reviewed]
0 4 0
HanzZ - 14 years ago 2011-07-29 22:54:28
hanzz.k@gmail.com
added collect_backend admininterface command + collecting one backend every 2 hours
4 files changed with 9 insertions and 4 deletions:
backends/libpurple/main.cpp
1
1
include/transport/networkpluginserver.h
2
1
src/admininterface.cpp
3
src/networkpluginserver.cpp
3
2
0 comments (0 inline, 0 general)
backends/libpurple/main.cpp
➞
Show inline comments
 
@@ -214,13 +214,13 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
 
			if (ret) {
 
				purple_buddy_icons_set_account_icon(account, (guchar *) contents, length);
 
			}
 

			




	
	
	
		
 
			purple_account_set_password(account, password.c_str());

			




	
	
	
		
 
			purple_account_set_enabled(account, "spectrum", TRUE);

			




	
	
	
		
 
			purple_account_set_bool(account, "custom_smileys", FALSE));

			




	
	
	
		
 
			purple_account_set_bool(account, "custom_smileys", FALSE);

			




	
	
	
		
 
			

			




	
	
	
		
 
			const PurpleStatusType *status_type = purple_account_get_status_type_with_primitive(account, PURPLE_STATUS_AVAILABLE);

			




	
	
	
		
 
			if (status_type != NULL) {

			




	
	
	
		
 
				purple_account_set_status(account, purple_status_type_get_id(status_type), TRUE, NULL);

			




	
	
	
		
 
			}

			




	
	
	
		
 
			m_accounts[account] = user;

			




        

    


    
    

    

        

                

                    include/transport/networkpluginserver.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -63,12 +63,14 @@ class NetworkPluginServer {

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		const std::list<Backend *> &getBackends() {

			




	
	
	
		
 
			return m_clients;

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void collectBackend();

			




	
	
	
		
 

			




	
	
	
		
 
		void handleMessageReceived(NetworkConversation *conv, boost::shared_ptr<Swift::Message> &message);

			




	
	
	
		
 

			




	
	
	
		
 
	private:

			




	
	
	
		
 
		void handleNewClientConnection(boost::shared_ptr<Swift::Connection> c);

			




	
	
	
		
 
		void handleSessionFinished(Backend *c);

			




	
	
	
		
 
		void handleDataRead(Backend *c, const Swift::SafeByteArray&);

			




	
	
		
 
@@ -101,13 +103,12 @@ class NetworkPluginServer {

			




	
	
	
		
 
		void handleVCardUpdated(User *user, boost::shared_ptr<Swift::VCard> vcard);

			




	
	
	
		
 
		void handleVCardRequired(User *user, const std::string &name, unsigned int id);

			




	
	
	
		
 

			




	
	
	
		
 
		void send(boost::shared_ptr<Swift::Connection> &, const std::string &data);

			




	
	
	
		
 

			




	
	
	
		
 
		void pingTimeout();

			




	
	
	
		
 
		void collectBackend();

			




	
	
	
		
 
		void sendPing(Backend *c);

			




	
	
	
		
 
		Backend *getFreeClient();

			




	
	
	
		
 

			




	
	
	
		
 
		UserManager *m_userManager;

			




	
	
	
		
 
		VCardResponder *m_vcardResponder;

			




	
	
	
		
 
		RosterResponder *m_rosterResponder;

			




        

    


    
    

    

        

                

                    src/admininterface.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -234,12 +234,15 @@ void AdminInterface::handleMessageReceived(Swift::Message::ref message) {

			




	
	
	
		
 
			}

			




	
	
	
		
 
			id++;

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		message->setBody(lst);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else if (message->getBody() == "collect_backend") {

			




	
	
	
		
 
		m_server->collectBackend();

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else if (message->getBody().find("help") == 0) {

			




	
	
	
		
 
		std::string help;

			




	
	
	
		
 
		help += "General:\n";

			




	
	
	
		
 
		help += "    status - shows instance status\n";

			




	
	
	
		
 
		help += "    reload - Reloads config file\n";

			




	
	
	
		
 
		help += "Users:\n";

			




        

    


    
    

    

        

                

                    src/networkpluginserver.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -143,13 +143,13 @@ NetworkPluginServer::NetworkPluginServer(Component *component, Config *config, U

			




	
	
	
		
 
	m_userManager->onUserDestroyed.connect(boost::bind(&NetworkPluginServer::handleUserDestroyed, this, _1));

			




	
	
	
		
 

			




	
	
	
		
 
	m_pingTimer = component->getNetworkFactories()->getTimerFactory()->createTimer(20000);

			




	
	
	
		
 
	m_pingTimer->onTick.connect(boost::bind(&NetworkPluginServer::pingTimeout, this));

			




	
	
	
		
 
	m_pingTimer->start();

			




	
	
	
		
 

			




	
	
	
		
 
	m_collectTimer = component->getNetworkFactories()->getTimerFactory()->createTimer(3600000);

			




	
	
	
		
 
	m_collectTimer = component->getNetworkFactories()->getTimerFactory()->createTimer(2*3600000);

			




	
	
	
		
 
	m_collectTimer->onTick.connect(boost::bind(&NetworkPluginServer::collectBackend, this));

			




	
	
	
		
 
	m_collectTimer->start();

			




	
	
	
		
 

			




	
	
	
		
 
	m_vcardResponder = new VCardResponder(component->getIQRouter(), userManager);

			




	
	
	
		
 
	m_vcardResponder->onVCardRequired.connect(boost::bind(&NetworkPluginServer::handleVCardRequired, this, _1, _2, _3));

			




	
	
	
		
 
	m_vcardResponder->onVCardUpdated.connect(boost::bind(&NetworkPluginServer::handleVCardUpdated, this, _1, _2));

			




	
	
		
 
@@ -598,12 +598,13 @@ void NetworkPluginServer::collectBackend() {

			




	
	
	
		
 
			max = (*it)->res;

			




	
	
	
		
 
			backend = (*it);

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (backend) {

			




	
	
	
		
 
		m_collectTimer->start();

			




	
	
	
		
 
		LOG4CXX_INFO(logger, "Backend " << backend << "is set to die");

			




	
	
	
		
 
		backend->acceptUsers = false;

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPluginServer::handleUserCreated(User *user) {

			




	
	
		
 
@@ -959,13 +960,13 @@ void NetworkPluginServer::sendPing(Backend *c) {

			




	
	
	
		
 
	}

			




	
	
	
		
 
// 	LOG4CXX_INFO(logger, "PING to " << c);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
NetworkPluginServer::Backend *NetworkPluginServer::getFreeClient() {

			




	
	
	
		
 
	NetworkPluginServer::Backend *c = NULL;

			




	
	
	
		
 
	bool spawnNew = false;

			




	
	
	
		
 
// 	bool spawnNew = false;

			




	
	
	
		
 
	for (std::list<Backend *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {

			




	
	
	
		
 
		// This backend is free.

			




	
	
	
		
 
		if ((*it)->acceptUsers && (*it)->users.size() < CONFIG_INT(m_config, "service.users_per_backend") && (*it)->connection) {

			




	
	
	
		
 
			c = *it;

			




	
	
	
		
 
			if (!CONFIG_BOOL(m_config, "service.reuse_old_backends")) {

			




	
	
	
		
 
				if (c->users.size() + 1 >= CONFIG_INT(m_config, "service.users_per_backend")) {

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: srv01-12228
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support