libtransport.git Changeset - a38596881211

Changeset - a38596881211

Parent rev.

Child rev.

[Not reviewed]

2 1 0

HanzZ - 13 years ago 2013-01-13 14:42:24
hanzz.k@gmail.com

Create loginTimer according to time diff

3 files changed with 5 insertions and 212 deletions:

include/transport/logger.h

src/logger.cpp

122

src/networkpluginserver.cpp

0 comments (0 inline, 0 general)

include/transport/logger.h

➞

Show inline comments

deleted file

src/logger.cpp

➞

Show inline comments

deleted file

src/networkpluginserver.cpp

➞

Show inline comments

@@ @@ -1719,13 +1719,17 @@ static void __unblock_signals ( void ) @@
 NetworkPluginServer::Backend *NetworkPluginServer::getFreeClient(bool acceptUsers, bool longRun, bool check) {
 	NetworkPluginServer::Backend *c = NULL;
 	unsigned long diff = CONFIG_INT(m_config, "service.login_delay");
 	time_t now = time(NULL);
 	if (diff && (now - m_lastLogin < diff)) {
 		m_loginTimer->stop();
 		m_loginTimer = m_component->getNetworkFactories()->getTimerFactory()->createTimer((diff - (now - m_lastLogin)) * 1000);
 		m_loginTimer->onTick.connect(boost::bind(&NetworkPluginServer::loginDelayFinished, this));
 		m_loginTimer->start();
 		LOG4CXX_INFO(logger, "Postponing login because of service.login_delay setting");
 		return NULL;
+	}
 	if (!check) {
 		m_lastLogin = time(NULL);
+	}
 	// Check all backends and find free one
 	for (std::list<Backend *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {
 		if ((*it)->willDie == false && (*it)->acceptUsers == acceptUsers && (*it)->users.size() < CONFIG_INT(m_config, "service.users_per_backend") && (*it)->connection && (*it)->longRun == longRun) {
 			c = *it;
 			// if we're not reusing all backends and backend is full, stop accepting new users on this backend
 			if (!CONFIG_BOOL(m_config, "service.reuse_old_backends")) {
 				if (c->users.size() + 1 >= CONFIG_INT(m_config, "service.users_per_backend")) {
+				if (!check && c->users.size() + 1 >= CONFIG_INT(m_config, "service.users_per_backend")) {
 					c->acceptUsers = false;
+				}
+			}
 			break;
+		}
+	}

0 comments (0 inline, 0 general)