Skip to content

Commit

Permalink
merged into wrong funciton
Browse files Browse the repository at this point in the history
  • Loading branch information
d-grossman committed Aug 18, 2016
1 parent 9dd61f5 commit c5e7839
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions poseidon/poseidonMain/Investigator/Investigator.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,16 @@ def process_new_machine(self, ip_addr):
# log error for investigation
print >> sys.stderr, 'duplicate record for machine: %s', ip_addr

def get_handlers(self, t):
handle_list = []
if t in self.handles:
handle_list.append(self.handles[t])

for helper in self.actions.itervalues():
if t in helper.handles:
handle_list.append(helper.handles[t])
return handle_list


class Investigator_Response(Investigator):
"""
Expand All @@ -194,6 +204,7 @@ class Investigator_Response(Investigator):

def __init__(self):
super(Investigator_Response, self).__init__()
self.logger = module_logger
self.jobs = {}

def vent_preparation(self):
Expand Down Expand Up @@ -232,14 +243,5 @@ def update_record(self):
except:
pass

def get_handlers(self, t):
handle_list = []
if t in self.handles:
handle_list.append(self.handles[t])

for helper in self.actions.itervalues():
if t in helper.handles:
handle_list.append(helper.handles[t])
return handle_list

investigator_interface = Investigator()

0 comments on commit c5e7839

Please sign in to comment.