From: zuber Date: Tue, 29 Sep 2009 21:34:33 +0000 (+0200) Subject: Wstępne wykorzystanie modułu logging. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/935076367b73bf9506751fe215cacc09c3d6e417?ds=sidebyside;hp=-c Wstępne wykorzystanie modułu logging. --- 935076367b73bf9506751fe215cacc09c3d6e417 diff --git a/apps/api/handlers/library_handlers.py b/apps/api/handlers/library_handlers.py index b2ff94b4..4d23478d 100644 --- a/apps/api/handlers/library_handlers.py +++ b/apps/api/handlers/library_handlers.py @@ -1,5 +1,6 @@ -import os.path # -*- encoding: utf-8 -*- +import os.path +import logging __author__= "Łukasz Rekucki" __date__ = "$2009-09-25 15:49:50$" @@ -29,6 +30,10 @@ from api.models import PartCache # import settings + +log = logging.getLogger('platforma.api') + + # # Document List Handlers # @@ -71,7 +76,7 @@ class LibraryHandler(BaseHandler): for part, docid in parts: # this way, we won't display broken links if not documents.has_key(part): - print "NOT FOUND:", part + log.info("NOT FOUND: %s", part) continue parent = documents[docid] @@ -108,7 +113,7 @@ class LibraryHandler(BaseHandler): try: lock = lib.lock() try: - print "DOCID", docid + log.info("DOCID %s", docid) doc = lib.document_create(docid) # document created, but no content yet @@ -171,6 +176,7 @@ class DocumentHandler(BaseHandler): @hglibrary def read(self, request, docid, lib): """Read document's meta data""" + log.info("Read %s", docid) try: doc = lib.document(docid) udoc = doc.take(request.user.username) @@ -243,17 +249,17 @@ class DocumentGalleryHandler(BaseHandler): dirpath = os.path.join(settings.MEDIA_ROOT, assoc.subpath) if not os.path.isdir(dirpath): - print u"[WARNING]: missing gallery %s" % dirpath + log.info(u"[WARNING]: missing gallery %s", dirpath) continue gallery = {'name': assoc.name, 'pages': []} for file in sorted(os.listdir(dirpath), key=natural_order()): - print file + log.info(file) name, ext = os.path.splitext(os.path.basename(file)) if ext.lower() not in ['.png', '.jpeg', '.jpg']: - print "Ignoring:", name, ext + log.info("Ignoring: %s %s", name, ext) continue url = settings.MEDIA_URL + assoc.subpath + u'/' + file.decode('utf-8'); @@ -318,7 +324,7 @@ class DocumentTextHandler(BaseHandler): includes = [m.groupdict()['link'] for m in (re.finditer(\ XINCLUDE_REGEXP, data, flags=re.UNICODE) or []) ] - print "INCLUDES: ", includes + log.info("INCLUDES: %s", includes) # TODO: provide useful routines to make this simpler def xml_update_action(lib, resolve): diff --git a/project/settings.py b/project/settings.py index 05518193..bcf73167 100644 --- a/project/settings.py +++ b/project/settings.py @@ -130,6 +130,19 @@ EDITOR_DEFAULT_SETTINGS = { ], } +# Python logging settings +import logging + +log = logging.getLogger('platforma') +log.setLevel(logging.DEBUG) +ch = logging.StreamHandler() +ch.setLevel(logging.DEBUG) +formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') +ch.setFormatter(formatter) +log.addHandler(ch) + + +# Import localsettings file, which may override settings defined here try: from localsettings import * except ImportError: