diff --git a/caotek_mesavoirs/views/default.py b/caotek_mesavoirs/views/default.py index 768d615..62436f9 100644 --- a/caotek_mesavoirs/views/default.py +++ b/caotek_mesavoirs/views/default.py @@ -226,7 +226,7 @@ def envoyerMail(request, destinataire, objet, corps): %s Cordialement, -gestion.entreprise-dumas.com +monaa.caotek.fr """ % (corps) diff --git a/caotek_mesavoirs/views/members.py b/caotek_mesavoirs/views/members.py index 8d68796..01c4951 100644 --- a/caotek_mesavoirs/views/members.py +++ b/caotek_mesavoirs/views/members.py @@ -43,7 +43,7 @@ def envoyer_mdp(request): lien = update_membre_mdp_oublie(request, login) body = u""" -Le lien suivant vous dirigera vers une page où vous pourrez ré-initialiser votre mot de passe d'accès à « gestion.entreprise-dumas.com » : +Le lien suivant vous dirigera vers une page où vous pourrez ré-initialiser votre mot de passe d'accès à « monaa.caotek.fr » : %s diff --git a/production.ini b/production.ini index 2221cf5..27d0cc2 100644 --- a/production.ini +++ b/production.ini @@ -40,13 +40,13 @@ url_scheme = https ### [loggers] -keys = root, caotek_mesavoirs, sqlalchemy, exc_logger +keys = root, caotek_mesavoirs, sqlalchemy [handlers] -keys = console, exc_handler +keys = console [formatters] -keys = generic, exc_formatter +keys = generic [logger_root] level = WARN @@ -57,22 +57,12 @@ level = WARN handlers = qualname = caotek_mesavoirs -[logger_exc_logger] -level = ERROR -handlers = exc_handler -qualname = exc_logger - [handler_console] class = StreamHandler args = (sys.stderr,) level = NOTSET formatter = generic -[handler_exc_handler] -class = handlers.RotatingFileHandler -args = ('exception.log', 'a', 10000000, 10) -level = ERROR -formatter = exc_formatter [logger_sqlalchemy] level = WARN @@ -90,6 +80,3 @@ formatter = generic [formatter_generic] format = %(asctime)s %(levelname)-5.5s [%(name)s:%(lineno)s][%(threadName)s] %(message)s - -[formatter_exc_formatter] -format = %(asctime)s %(message)s diff --git a/pyramidsvc.py b/pyramidsvc.py deleted file mode 100644 index acb43c5..0000000 --- a/pyramidsvc.py +++ /dev/null @@ -1,51 +0,0 @@ -# uncomment the next import line to get print to show up or see early -# exceptions if there are errors then run -# python -m win32traceutil -# to see the output -#import win32traceutil -import win32serviceutil - -PORT_TO_BIND = 9180 -CONFIG_FILE = 'production.ini' -SERVER_NAME = 'gestion.entreprise-dumas.com' - -SERVICE_NAME = "Pyramid_Service" -SERVICE_DISPLAY_NAME = "Pyramid Web Service" -SERVICE_DESCRIPTION = """Permet de laner l'application Pyramid comme un servcie.""" - -class PyWebService(win32serviceutil.ServiceFramework): - """Python Web Service.""" - - _svc_name_ = SERVICE_NAME - _svc_display_name_ = SERVICE_DISPLAY_NAME - _svc_deps_ = None # sequence of service names on which this depends - # Only exists on Windows 2000 or later, ignored on Windows NT - _svc_description_ = SERVICE_DESCRIPTION - - def SvcDoRun(self): - from cherrypy import wsgiserver - from pyramid.paster import get_app - from pyramid.paster import setup_logging - import os, sys - - path = os.path.dirname(os.path.abspath(__file__)) - - os.chdir(path) - - app = get_app(CONFIG_FILE) - setup_logging(CONFIG_FILE) - - - self.server = wsgiserver.CherryPyWSGIServer( - ('0.0.0.0', PORT_TO_BIND), app, - server_name=SERVER_NAME) - - self.server.start() - - - def SvcStop(self): - self.server.stop() - - -if __name__ == '__main__': - win32serviceutil.HandleCommandLine(PyWebService)