diff --git a/intranet/Root.py b/intranet/Root.py index c5894bf9..8e3a7a64 100755 --- a/intranet/Root.py +++ b/intranet/Root.py @@ -51,10 +51,10 @@ if (options.port): if (cherrypy.config.configMap["global"]["server.environment"] == "development"): from ldap_crans_test import crans_ldap - print("settings : unsing test ldap : env=" + cherrypy.config.configMap["global"]["server.environment"]) + cherrypy.log("settings : unsing test ldap : env=" + cherrypy.config.configMap["global"]["server.environment"], "LDAP") else: from ldap_crans import crans_ldap - print("settings : unsing prod ldap : env=" + cherrypy.config.configMap["global"]["server.environment"]) + cherrypy.log("settings : unsing prod ldap : env=" + cherrypy.config.configMap["global"]["server.environment"], "LDAP") cherrypy.config.update({'global':{'crans_ldap':crans_ldap()}}) # ######################################################## # diff --git a/intranet/conf/dev.cfg b/intranet/conf/dev.cfg index dfd6e8fb..995c7098 100644 --- a/intranet/conf/dev.cfg +++ b/intranet/conf/dev.cfg @@ -7,6 +7,8 @@ server.socketQueueSize=5 server.protocolVersion="HTTP/1.0" server.logToScreen=True server.logFile="" +server.logAccessFile="" +server.logTracebacks="" server.reverseDNS=False server.threadPool=10 server.environment="development" diff --git a/intranet/conf/prod.cfg b/intranet/conf/prod.cfg index 7ef5b5a1..70792ca9 100644 --- a/intranet/conf/prod.cfg +++ b/intranet/conf/prod.cfg @@ -6,7 +6,9 @@ server.socketFile="" server.socketQueueSize=10 server.protocolVersion="HTTP/1.0" server.logToScreen=False -server.logFile="" +server.logFile="/var/log/intranet/cherrypy.log" +server.logAccessFile="/var/log/intranet/access.log" +server.logTracebacks=True server.reverseDNS=False server.threadPool=10 server.environment="production" @@ -16,4 +18,4 @@ logDebugInfoFilter.on = False #base_url_filter.on = True #base_url_filter.base_url = "https://intranet2.crans.org/" -#base_url_filter.use_x_forwarded_host = True \ No newline at end of file +#base_url_filter.use_x_forwarded_host = True diff --git a/intranet/pages/digicode.py b/intranet/pages/digicode.py index bd17dbd2..7bc4f191 100755 --- a/intranet/pages/digicode.py +++ b/intranet/pages/digicode.py @@ -3,14 +3,11 @@ import cherrypy, tempfile, shutil, os import crans.impression import crans.impression.digicode -FILE_UPLOAD_BASE_FOLDER = cherrypy.config.get('fileUpload.folder', "/var/impression/fichiers/") +#FILE_UPLOAD_BASE_FOLDER = cherrypy.config.get('fileUpload.folder', "/var/impression/fichiers/") -class FileError(Exception): - pass +#class FileError(Exception): pass class root: - - ########################## # affichage ########################## @@ -35,7 +32,6 @@ class root: def codeList(self): try: listeBrute = crans.impression.digicode.list_code() - liste_formatee = [] for aCode in listeBrute: age = aCode[1] @@ -51,6 +47,7 @@ class root: liste_formatee.append({'code':aCode[0], 'age':age_string, 'desc':aCode[2]}) return {'codes': liste_formatee} except Exception, e: + cherrypy.log('erreur lors de la creation de la liste de codes :' + str(e), 'DIGICODE', 1) return {'erreur':str(e)} codeList.exposed= True @@ -60,16 +57,17 @@ class root: def createCode(self, code=None): try: if code: - try: - int(code) - if code.__len__() != 6: - raise - except: - return {'formatErreur':1} - code = crans.impression.digicode.save_code(code, "Intranet (digicode)") + try: + int(code) + if code.__len__() != 6: + raise + except: + return {'formatErreur':1} + code = crans.impression.digicode.save_code(code, "Intranet (digicode)") else: - code = crans.impression.digicode.gen_code("Intranet (digicode)") + code = crans.impression.digicode.gen_code("Intranet (digicode)") return {'code': code, "age" : "new", "desc":"Intranet (digicode)"} except Exception, e: + cherrypy.log("erreur lors de la creation de code : " + str(e), 'DIGICODE', 1) return {'erreur':str(e)} createCode.exposed= True