[Os-sim-commits] os-sim/frameworkd/ossimframework Action.py,1.19,1.20

[David G. <dv...@us...>]

Update of /cvsroot/os-sim/os-sim/frameworkd/ossimframework
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31777

Modified Files:
	Action.py 
Log Message:
tengo que resolver ips, puertos, plugins, etc


Index: Action.py
===================================================================
RCS file: /cvsroot/os-sim/os-sim/frameworkd/ossimframework/Action.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Action.py	27 Jun 2005 14:19:06 -0000	1.19
--- Action.py	18 Jul 2005 10:36:44 -0000	1.20
***************
*** 213,216 ****
--- 213,224 ----
  
  
+     def requestRepr(self, request):
+         
+         str  = " Alert detail: \n"
+         for key, value in request.iteritems():
+             str += " * %s: \t%s\n" % (key, value)
+         return str
+ 
+ 
      def doAction(self, action_id):
  
***************
*** 232,236 ****
                                 action_email['subject'],
                                 action_email['message'] +\
!                                "\n\n" + repr(self.__request))
                      del(m)
                  
--- 240,244 ----
                                 action_email['subject'],
                                 action_email['message'] +\
!                                "\n\n" + self.requestRepr(self.__request))
                      del(m)
                  
***************
*** 245,249 ****
                      del(c)
  
-     
  
      # Notify every alarm if email_alert is set
--- 253,256 ----
***************
*** 258,262 ****
                         [ self.__conf['email_alert'] ],
                         "Ossim Alert from server '%s'" % (socket.gethostname()),
!                        repr(self.__request))
              print __name__, ": Notification send to %s" %\
                  (self.__conf['email_alert'])
--- 265,269 ----
                         [ self.__conf['email_alert'] ],
                         "Ossim Alert from server '%s'" % (socket.gethostname()),
!                        self.requestRepr(self.__request))
              print __name__, ": Notification send to %s" %\
                  (self.__conf['email_alert'])