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" + try: text += "url: %s\n" % cherrypy.request.browser_url + except: text += "url: \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"