Liderahenk/Ahenk
1
0
Fork 0
mirror of https://github.com/Pardus-LiderAhenk/ahenk synced 2024-11-29 09:42:23 +03:00
Code Issues Projects Releases Packages Wiki Activity

minor log fixes

Browse source
This commit is contained in:
Volkan Şahin 2016-05-26 11:19:34 +03:00
parent 1bcf949782
commit 060ac2c5c8
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
opt/ahenk/base/plugin/Plugin.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/python3 #!/usr/bin/python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Author: İsmail BAŞARAN <ismail.basaran@tubitak.gov.tr> <basaran.ismaill@gmail.com> # Author: İsmail BAŞARAN <ismail.basaran@tubitak.gov.tr> <basaran.ismaill@gmail.com>
import subprocess
import threading import threading
from base.Scope import Scope from base.Scope import Scope
@ -61,42 +61,45 @@ class Plugin(threading.Thread):
item_obj = self.InQueue.get(block=True) item_obj = self.InQueue.get(block=True)
obj_name = item_obj.obj_name obj_name = item_obj.obj_name
except Exception as e: except Exception as e:
self.logger.error('[Plugin] A problem occurred while executing process. Error Message: {}'.format()) self.logger.error('[Plugin] A problem occurred while executing process. Error Message: {}'.format(str(e)))
if obj_name == "TASK": if obj_name == "TASK":
self.logger.debug('[Plugin] Executing task') self.logger.debug('[Plugin] Executing task')
command = Scope.getInstance().getPluginManager().findCommand(self.getName(), item_obj.get_command_cls_id().lower()) command = Scope.getInstance().getPluginManager().findCommand(self.getName(), item_obj.get_command_cls_id().lower())
self.logger.debug('[Plugin] Handling task')
command.handle_task(item_obj, self.context) command.handle_task(item_obj, self.context)
self.logger.debug('[Plugin] Creating response')
response = Response(type=MessageType.TASK_STATUS.value, id=item_obj.get_id(), code=self.context.get('responseCode'), message=self.context.get('responseMessage'), data=self.context.get('responseData'), content_type=self.context.get('contentType')) response = Response(type=MessageType.TASK_STATUS.value, id=item_obj.get_id(), code=self.context.get('responseCode'), message=self.context.get('responseMessage'), data=self.context.get('responseData'), content_type=self.context.get('contentType'))
# self.response_queue.put(self.messaging.response_msg(response)) #TODO DEBUG # self.response_queue.put(self.messaging.response_msg(response)) #TODO DEBUG
self.logger.debug('[Plugin] Sending response')
Scope.getInstance().getMessager().send_direct_message(self.messaging.task_status_msg(response)) # TODO REMOVE Scope.getInstance().getMessager().send_direct_message(self.messaging.task_status_msg(response)) # TODO REMOVE
elif obj_name == "PROFILE": elif obj_name == "PROFILE":
self.logger.debug('[Plugin] Executing profile') self.logger.debug('[Plugin] Executing profile')
profile_data = item_obj.get_profile_data() profile_data = item_obj.get_profile_data()
policy_module = Scope.getInstance().getPluginManager().findPolicyModule(item_obj.get_plugin().get_name()) policy_module = Scope.getInstance().getPluginManager().findPolicyModule(item_obj.get_plugin().get_name())
self.context.put('username', item_obj.get_username()) self.context.put('username', item_obj.get_username())
policy_module.handle_policy(profile_data, self.context)
self.logger.debug('[Plugin] Handling profile')
policy_module.handle_policy(profile_data, self.context)
execution_id = self.get_execution_id(item_obj.get_id()) execution_id = self.get_execution_id(item_obj.get_id())
policy_ver = self.get_policy_version(item_obj.get_id()) policy_ver = self.get_policy_version(item_obj.get_id())
self.logger.debug('[Plugin] Creating response')
response = Response(type=MessageType.POLICY_STATUS.value, id=item_obj.get_id(), code=self.context.get('responseCode'), message=self.context.get('responseMessage'), data=self.context.get('responseData'), content_type=self.context.get('contentType'), execution_id=execution_id, policy_version=policy_ver) response = Response(type=MessageType.POLICY_STATUS.value, id=item_obj.get_id(), code=self.context.get('responseCode'), message=self.context.get('responseMessage'), data=self.context.get('responseData'), content_type=self.context.get('contentType'), execution_id=execution_id, policy_version=policy_ver)
# self.response_queue.put(self.messaging.response_msg(response)) #TODO DEBUG # self.response_queue.put(self.messaging.response_msg(response)) #TODO DEBUG
self.logger.debug('[Plugin] Sending response')
Scope.getInstance().getMessager().send_direct_message(self.messaging.policy_status_msg(response)) # TODO REMOVE Scope.getInstance().getMessager().send_direct_message(self.messaging.policy_status_msg(response)) # TODO REMOVE
elif obj_name == "KILL_SIGNAL": elif obj_name == "KILL_SIGNAL":
self.keep_run = False self.keep_run = False
self.logger.debug('[Plugin] Killing queue ! Plugin Name : ' + str(self.name)) self.logger.debug('[Plugin] Killing queue ! Plugin Name: {}'.format(str(self.name)))
elif obj_name == "SAFE_MODE": elif obj_name == "SAFE_MODE":
username = item_obj.username username = item_obj.username
safe_mode_module = Scope.getInstance().getPluginManager().find_safe_mode_module(self.name) safe_mode_module = Scope.getInstance().getPluginManager().find_safe_mode_module(self.name)
safe_mode_module.handle_safe_mode(username, self.context) safe_mode_module.handle_safe_mode(username, self.context)
else: else:
self.logger.warning("[Plugin] Not supported object type " + obj_name) self.logger.warning("[Plugin] Not supported object type: {}".format(str(obj_name)))
# Empty context for next use # Empty context for next use
self.context.empty_data() self.context.empty_data()