Changeset - 85600b449fe1
Parent rev.
Child rev.
[Not reviewed]
0 3 0
HanzZ - 14 years ago 2011-09-27 20:16:59
hanzz.k@gmail.com
added service.memory_collector_time to configure backend collection basend on highest memory usage. By default this feature is deactivated
3 files changed with 8 insertions and 3 deletions:
spectrum/src/sample.cfg
2
2
src/config.cpp
1
src/networkpluginserver.cpp
5
1
0 comments (0 inline, 0 general)
spectrum/src/sample.cfg
➞
Show inline comments
 
@@ -9,14 +9,14 @@ backend_port=10001
 
admin_username=admin
 
admin_password=test
 
#cert=server.pfx #patch to PKCS#12 certificate
 
#cert_password=test #password to that certificate if any
 
users_per_backend=10
 
backend=/home/hanzz/code/libtransport/backends/libpurple/spectrum2_libpurple_backend
 
#backend=/home/hanzz/code/libtransport/backends/frotz/spectrum_frotz_backend
 
#backend=../../backends/libircclient-qt/spectrum_libircclient-qt_backend
 
#backend=/home/hanzz/code/libtransport/backends/frotz/spectrum2_frotz_backend
 
#backend=../../backends/libircclient-qt/spectrum2_libircclient-qt_backend
 
#protocol=prpl-msn
 
protocol=any
 
#protocol=prpl-icq
 

			




	
	
	
		
 
[backend]

			




	
	
	
		
 
#default_avatar=catmelonhead.jpg

			




        

    


    
    

    

        

                

                    src/config.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -64,12 +64,13 @@ bool Config::load(std::istream &ifs, boost::program_options::options_description

			




	
	
	
		
 
		("service.cert", value<std::string>()->default_value(""), "PKCS#12 Certificate.")

			




	
	
	
		
 
		("service.cert_password", value<std::string>()->default_value(""), "PKCS#12 Certificate password.")

			




	
	
	
		
 
		("service.admin_username", value<std::string>()->default_value(""), "Administrator username.")

			




	
	
	
		
 
		("service.admin_password", value<std::string>()->default_value(""), "Administrator password.")

			




	
	
	
		
 
		("service.reuse_old_backends", value<bool>()->default_value(true), "True if Spectrum should use old backends which were full in the past.")

			




	
	
	
		
 
		("service.idle_reconnect_time", value<int>()->default_value(0), "Time in seconds after which idle users are reconnected to let their backend die.")

			




	
	
	
		
 
		("service.memory_collector_time", value<int>()->default_value(0), "Time in seconds after which backend with most memory is set to die.")

			




	
	
	
		
 
		("service.more_resources", value<bool>()->default_value(false), "Allow more resources to be connected in server mode at the same time.")

			




	
	
	
		
 
		("service.enable_privacy_lists", value<bool>()->default_value(true), "")

			




	
	
	
		
 
		("identity.name", value<std::string>()->default_value("Spectrum 2 Transport"), "Name showed in service discovery.")

			




	
	
	
		
 
		("identity.category", value<std::string>()->default_value("gateway"), "Disco#info identity category. 'gateway' by default.")

			




	
	
	
		
 
		("identity.type", value<std::string>()->default_value(""), "Type of transport ('icq','msn','gg','irc', ...)")

			




	
	
	
		
 
		("registration.enable_public_registration", value<bool>()->default_value(true), "True if users should be able to register.")

			




        

    


    
    

    

        

                

                    src/networkpluginserver.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -214,15 +214,17 @@ 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(2*3600000);

			




	
	
	
		
 
	if (CONFIG_INT(m_config, "service.memory_collector_time") != 0) {

			




	
	
	
		
 
		m_collectTimer = component->getNetworkFactories()->getTimerFactory()->createTimer(CONFIG_INT(m_config, "service.memory_collector_time"));

			




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

			




	
	
	
		
 
		m_collectTimer->start();

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




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

			




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

			




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

			




	
	
	
		
 
	m_vcardResponder->start();

			




	
	
	
		
 

			




	
	
		
 
@@ -733,13 +735,15 @@ void NetworkPluginServer::collectBackend() {

			




	
	
	
		
 
			max = (*it)->res;

			




	
	
	
		
 
			backend = (*it);

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (backend) {

			




	
	
	
		
 
		if (m_collectTimer) {

			




	
	
	
		
 
			m_collectTimer->start();

			




	
	
	
		
 
		}

			




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

			




	
	
	
		
 
		backend->acceptUsers = false;

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool NetworkPluginServer::moveToLongRunBackend(User *user) {

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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