# Tony Mack <tmack@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: Events.py,v 1.8 2006/11/29 17:57:27 tmack Exp $
+# $Id: Events.py 5574 2007-10-25 20:33:17Z thierry $
#
from PLC.Faults import *
'event_id': Parameter(int, "Event identifier"),
'person_id': Parameter(int, "Identifier of person responsible for event, if any"),
'node_id': Parameter(int, "Identifier of node responsible for event, if any"),
+ 'auth_type': Parameter(int, "Type of auth used. i.e. AuthMethod"),
'fault_code': Parameter(int, "Event fault code"),
'call_name': Parameter(str, "Call responsible for this event"),
'call': Parameter(str, "Call responsible for this event, including paramters"),
+ 'message': Parameter(str, "High level description of this event"),
'runtime': Parameter(float, "Runtime of event"),
'time': Parameter(int, "Date and time that the event took place, in seconds since UNIX epoch", ro = True),
- 'object_ids': Parameter([int], "IDs of objects affected by this event")
+ 'object_ids': Parameter([int], "IDs of objects affected by this event"),
+ 'object_types': Parameter([str], "What type of object were affected by this event")
}
- def add_object(self, object_id, commit = True):
+ def add_object(self, object_type, object_id, commit = True):
"""
Relate object to this event.
"""
self['object_ids'] = []
if object_id not in self['object_ids']:
- self.api.db.do("INSERT INTO event_object (event_id, object_id)" \
- " VALUES(%(event_id)d, %(object_id)d)",
+ self.api.db.do("INSERT INTO event_object (event_id, object_id, object_type)" \
+ " VALUES(%(event_id)d, %(object_id)d, %(object_type)s)",
locals())
if commit:
event_filter = Filter(Event.fields, {'event_id': event_filter})
elif isinstance(event_filter, dict):
event_filter = Filter(Event.fields, event_filter)
- sql += " AND (%s)" % event_filter.sql(api)
- sql += " ORDER BY %s" % Event.primary_key
+ sql += " AND (%s) %s" % event_filter.sql(api)
+# with new filtering, caller needs to set this explicitly
+# sql += " ORDER BY %s" % Event.primary_key
self.selectall(sql)