From a2e651c36ed7c12710cff1d79fbd05051a9d7c52 Mon Sep 17 00:00:00 2001
From: gdetrez <none>
Date: Wed, 13 Jun 2007 15:59:56 +0200
Subject: [PATCH] =?UTF-8?q?Rapports=20de=20bug=20plus=20concis=20et=20plus?=
 =?UTF-8?q?=20utils=20(j'esp=C3=A8re)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

darcs-hash:20070613135956-f46e9-a57be9ae11383814f2f489629221094f49362262.gz
---
 intranet/ClassesIntranet/Intranet.py | 38 +++++++++++++++-------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/intranet/ClassesIntranet/Intranet.py b/intranet/ClassesIntranet/Intranet.py
index eddcb2ed..10115efb 100755
--- a/intranet/ClassesIntranet/Intranet.py
+++ b/intranet/ClassesIntranet/Intranet.py
@@ -143,30 +143,39 @@ class Intranet:
 
     def send_error_repport(self, **kw):
 
-        # on recupere tout de suite le traceback
-        tb = crans.utils.exceptions.formatExc()
         # entetes du mail
         exp = "intranet"
         dest = cherrypy.config.get("mail.bugreport", "nounous@crans.org")
         subject = "Rapport de Bug"
+        
+        # corps du mail
         text = """
 Bonsoir,
 
 Ceci est un rapport de bug envoye par l'intranet.
 
-%s
-        """ % "\n".join( [ "%s: %s" % (str(a), str(kw[a])) for a in kw] )
+        """
+        
+        # on recupere tout de suite le traceback
+        tb = crans.utils.exceptions.formatExc()
+        text += "\n= Traceback =\n"
+        text += tb
+        
+        text +="\n= Autres informations =\n"
+        autres_informations = "\n".join( [ "%s: %s" % (str(a), str(kw[a])) for a in kw] )
+        text += autres_informations
+        text += "\n"
         
         #On ajoute des variables de cherrypy
         text += "\n= Cherrypy vars =\n"
-        try:
-            text += "url: %s\n" % cherrypy.request.browser_url
-        except:
-            pass
-        try:
-            text += "headers: \n %s\n" %  "\n".join( ["    %s: %s" % (str(a), str(cherrypy.request.headers[a])) for a in cherrypy.request.headers] )
-        except:
-            pass
+        try: text += "user: %s\n" % cherrypy.session['uid']
+        except: text += "user: <n/a>\n"
+        try: text += "url: %s\n" % cherrypy.request.browser_url
+        except: text += "url: <n/a>\n"
+        #try:
+        #    text += "headers: \n %s\n" %  "\n".join( ["    %s: %s" % (str(a), str(cherrypy.request.headers[a])) for a in cherrypy.request.headers] )
+        #except:
+        #    pass
         try:
             text += "query_string: %s\n" % cherrypy.request.query_string
         except:
@@ -176,11 +185,6 @@ Ceci est un rapport de bug envoye par l'intranet.
         except:
             pass
         
-
-        # on ajoute le traceback
-        text += "\n= Traceback =\n"
-        text += tb
-        
         #on signe, quand meme !
         text += "\n-- \nRoot.py pour l'intranet\n"