From 41eca527a846b5c01a17acf97520b9d84face7b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tuncay=20=C3=87OLAK?= Date: Mon, 29 Jun 2020 11:25:36 +0300 Subject: [PATCH] Syncing /usr/share/ahenk to src and recreating ahenk.install --- usr/share/ahenk/base/command/command_runner.py | 2 +- usr/share/ahenk/base/messaging/messaging.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/usr/share/ahenk/base/command/command_runner.py b/usr/share/ahenk/base/command/command_runner.py index 2a57dfd..cf60e0a 100644 --- a/usr/share/ahenk/base/command/command_runner.py +++ b/usr/share/ahenk/base/command/command_runner.py @@ -184,7 +184,7 @@ class CommandRunner(object): elif str(json_data['event']) == 'unregister' and len(json_data)==1: self.logger.info('Unregistering..') self.execute_manager.set_unregister_credential_params(None, None) - unregister_message = self.message_manager.unregister_msg() + unregister_message = self.message_manager.unregister_msg(None,None) if unregister_message is not None: self.messenger.send_direct_message(unregister_message) diff --git a/usr/share/ahenk/base/messaging/messaging.py b/usr/share/ahenk/base/messaging/messaging.py index 425314c..d9b7b41 100644 --- a/usr/share/ahenk/base/messaging/messaging.py +++ b/usr/share/ahenk/base/messaging/messaging.py @@ -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 !',