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

display error fix

Browse source
This commit is contained in:
Edip Yıldız 2020-06-25 10:37:36 +03:00
parent bf900f2a6b
commit 7772ff8937
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/ahenkd.py
View file

@ -174,6 +174,7 @@ class AhenkDaemon(BaseDaemon):
except Exception as e:
self.registration_failed()
self.logger.error('Registration failed. Error message: {0}'.format(str(e)))
#Util.execute("/etc/init.d/ahenk stop")
def is_registered(self):

12
src/base/execution/execution_manager.py
View file

@ -410,15 +410,19 @@ class ExecutionManager(object):
if 'not_authorized' == str(status):
self.logger.info('UnRegistration is failed. User not authorized')
if self.unregister_user_name is None:
user_name = os.getlogin()
display = Util.get_username_display()
#user_name = os.getlogin()
#display = Util.get_username_display()
user_name = self.db_service.select_one_result('session', 'username', " 1=1 order by id desc ")
display = self.db_service.select_one_result('session', 'display', " 1=1 order by id desc ")
Util.show_message(user_name, display,
'Ahenk Lider MYS sisteminden çıkarmak için yetkili kullanıcı haklarına sahip olmanız gerekmektedir.',
'Kullanıcı Yetkilendirme Hatası')
else:
if self.unregister_user_name is None:
user_name = os.getlogin()
display = Util.get_username_display()
#user_name = os.getlogin()
#display = Util.get_username_display()
user_name = self.db_service.select_one_result('session', 'username', " 1=1 order by id desc ")
display = self.db_service.select_one_result('session', 'display', " 1=1 order by id desc ")
Util.show_message(user_name, display, "Ahenk Lider MYS sisteminden çıkarılmıştır.", "")
if Util.show_message(user_name, display,
"Değişikliklerin etkili olması için sistem yeniden başlatılacaktır. Lütfen bekleyiniz...",

8
src/base/messaging/messaging.py
View file

@ -171,10 +171,10 @@ class Messaging(object):
data['password'] = str(self.conf_manager.get('CONNECTION', 'password'))
# unregistration from commandline..
if(usernameForCheck==None and passwordForCheck==None):
#user_name = self.db_service.select_one_result('session', 'username')
#display = self.db_service.select_one_result('session', 'display')
user_name = os.getlogin()
display = Util.get_username_display()
user_name = self.db_service.select_one_result('session', 'username')
display = self.db_service.select_one_result('session', 'display')
#user_name = os.getlogin()
#display = Util.get_username_display()
self.logger.debug('User : ' + str(user_name))
pout = Util.show_unregistration_message(user_name,display,
'Makineyi etki alanından çıkarmak için zorunlu alanları giriniz. Lütfen DEVAM EDEN İŞLEMLERİNİZİ sonlandırdığınıza emin olunuz !',