Logs pour l'intranet
darcs-hash:20061025153726-f46e9-0938346d89216d3205444a7a94e3391ef4a416f7.gz
This commit is contained in:
parent
4f932e2287
commit
14cf75e894
4 changed files with 20 additions and 18 deletions
|
@ -51,10 +51,10 @@ if (options.port):
|
||||||
|
|
||||||
if (cherrypy.config.configMap["global"]["server.environment"] == "development"):
|
if (cherrypy.config.configMap["global"]["server.environment"] == "development"):
|
||||||
from ldap_crans_test import crans_ldap
|
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:
|
else:
|
||||||
from ldap_crans import crans_ldap
|
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()}})
|
cherrypy.config.update({'global':{'crans_ldap':crans_ldap()}})
|
||||||
|
|
||||||
# ######################################################## #
|
# ######################################################## #
|
||||||
|
|
|
@ -7,6 +7,8 @@ server.socketQueueSize=5
|
||||||
server.protocolVersion="HTTP/1.0"
|
server.protocolVersion="HTTP/1.0"
|
||||||
server.logToScreen=True
|
server.logToScreen=True
|
||||||
server.logFile=""
|
server.logFile=""
|
||||||
|
server.logAccessFile=""
|
||||||
|
server.logTracebacks=""
|
||||||
server.reverseDNS=False
|
server.reverseDNS=False
|
||||||
server.threadPool=10
|
server.threadPool=10
|
||||||
server.environment="development"
|
server.environment="development"
|
||||||
|
|
|
@ -6,7 +6,9 @@ server.socketFile=""
|
||||||
server.socketQueueSize=10
|
server.socketQueueSize=10
|
||||||
server.protocolVersion="HTTP/1.0"
|
server.protocolVersion="HTTP/1.0"
|
||||||
server.logToScreen=False
|
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.reverseDNS=False
|
||||||
server.threadPool=10
|
server.threadPool=10
|
||||||
server.environment="production"
|
server.environment="production"
|
||||||
|
|
|
@ -3,14 +3,11 @@ import cherrypy, tempfile, shutil, os
|
||||||
import crans.impression
|
import crans.impression
|
||||||
import crans.impression.digicode
|
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):
|
#class FileError(Exception): pass
|
||||||
pass
|
|
||||||
|
|
||||||
class root:
|
class root:
|
||||||
|
|
||||||
|
|
||||||
##########################
|
##########################
|
||||||
# affichage
|
# affichage
|
||||||
##########################
|
##########################
|
||||||
|
@ -35,7 +32,6 @@ class root:
|
||||||
def codeList(self):
|
def codeList(self):
|
||||||
try:
|
try:
|
||||||
listeBrute = crans.impression.digicode.list_code()
|
listeBrute = crans.impression.digicode.list_code()
|
||||||
|
|
||||||
liste_formatee = []
|
liste_formatee = []
|
||||||
for aCode in listeBrute:
|
for aCode in listeBrute:
|
||||||
age = aCode[1]
|
age = aCode[1]
|
||||||
|
@ -51,6 +47,7 @@ class root:
|
||||||
liste_formatee.append({'code':aCode[0], 'age':age_string, 'desc':aCode[2]})
|
liste_formatee.append({'code':aCode[0], 'age':age_string, 'desc':aCode[2]})
|
||||||
return {'codes': liste_formatee}
|
return {'codes': liste_formatee}
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
|
cherrypy.log('erreur lors de la creation de la liste de codes :' + str(e), 'DIGICODE', 1)
|
||||||
return {'erreur':str(e)}
|
return {'erreur':str(e)}
|
||||||
codeList.exposed= True
|
codeList.exposed= True
|
||||||
|
|
||||||
|
@ -60,16 +57,17 @@ class root:
|
||||||
def createCode(self, code=None):
|
def createCode(self, code=None):
|
||||||
try:
|
try:
|
||||||
if code:
|
if code:
|
||||||
try:
|
try:
|
||||||
int(code)
|
int(code)
|
||||||
if code.__len__() != 6:
|
if code.__len__() != 6:
|
||||||
raise
|
raise
|
||||||
except:
|
except:
|
||||||
return {'formatErreur':1}
|
return {'formatErreur':1}
|
||||||
code = crans.impression.digicode.save_code(code, "Intranet (digicode)")
|
code = crans.impression.digicode.save_code(code, "Intranet (digicode)")
|
||||||
else:
|
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)"}
|
return {'code': code, "age" : "new", "desc":"Intranet (digicode)"}
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
|
cherrypy.log("erreur lors de la creation de code : " + str(e), 'DIGICODE', 1)
|
||||||
return {'erreur':str(e)}
|
return {'erreur':str(e)}
|
||||||
createCode.exposed= True
|
createCode.exposed= True
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue