Liderahenk/Ahenk
1
0
Fork 0
mirror of https://github.com/Pardus-LiderAhenk/ahenk synced 2024-11-22 15:32:19 +03:00
Code Issues Projects Releases Packages Wiki Activity

minor bug fixed about db connection not sharing between threads problem

Browse source
This commit is contained in:
Volkan Şahin 2016-07-25 16:28:23 +03:00
parent dbfe504292
commit 90a03c1598
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
opt/ahenk/base/registration/Registration.py
View file

@ -12,7 +12,7 @@ from base.messaging.AnonymousMessenger import AnonymousMessager
from base.system.system import System from base.system.system import System
from base.timer.setup_timer import SetupTimer from base.timer.setup_timer import SetupTimer
from base.timer.timer import Timer from base.timer.timer import Timer
from base.system.system import System
class Registration: class Registration:
def __init__(self): def __init__(self):
@ -34,8 +34,8 @@ class Registration:
def registration_request(self): def registration_request(self):
self.logger.debug('[Registration] Requesting registration') self.logger.debug('[Registration] Requesting registration')
SetupTimer.start(Timer(System.Ahenk.registration_timeout(), timeout_function=self.registration_timeout, checker_func=self.is_registered, kwargs=None)) SetupTimer.start(Timer(System.Ahenk.registration_timeout(), timeout_function=self.registration_timeout, checker_func=self.is_registered, kwargs=None))
anon_messager = AnonymousMessager(self.message_manager.registration_msg()) anon_messenger = AnonymousMessager(self.message_manager.registration_msg())
anon_messager.connect_to_server() anon_messenger.connect_to_server()
def ldap_registration_request(self): def ldap_registration_request(self):
self.logger.debug('[Registration] Requesting LDAP registration') self.logger.debug('[Registration] Requesting LDAP registration')
@ -72,11 +72,14 @@ class Registration:
self.logger.debug('[Registration] Registration configuration file is updated') self.logger.debug('[Registration] Registration configuration file is updated')
def is_registered(self): def is_registered(self):
registered = self.db_service.select_one_result('registration', 'registered', 'registered = 1')
if registered == 1: try:
if str(System.Ahenk.uid()):
return True return True
else: else:
return False return False
except:
return False
def is_ldap_registered(self): def is_ldap_registered(self):
dn = self.db_service.select_one_result('registration', 'dn', 'registered = 1') dn = self.db_service.select_one_result('registration', 'dn', 'registered = 1')