Commit: 1f38193e599003353169196f3064e99ed0f3e4be - newsfour (git)

news4 - RSS aggrigation system

Commit MetaInfo

• Révision: 1f38193e599003353169196f3064e99ed0f3e4be (tree)
• l'heure: 2012-10-19 22:43:22
• Auteur: hylom <hylom@hylo...>
• Commiter: hylom

Message de Log

add logging utils

Change Summary

• modified: fetcher.py
• modified: filters/pr_block.py
• modified: gnews.py
• modified: renderer.py

Modification

--- a/fetcher.py
+++ b/fetcher.py
@@ -6,6 +6,7 @@ import re
 import feedparser
 import dateutil.parser
 from config import config as config, target_rss as target_rss
+from logger import log
 
 class FeedFetcher(object):
     'Feed fetching and parsing'
@@ -34,7 +35,7 @@ class FeedFetcher(object):
     def _embeded_filter(self, entry):
         # remove PR entry
         if re.search(u'^(PR|AD)(:|：)', entry['title']):
-            print 'delete PR entry - %s' % entry['title']
+            log('delete PR entry - %s' % entry['title'])
             return None
         return entry
 

--- a/filters/pr_block.py
+++ b/filters/pr_block.py
@@ -5,7 +5,7 @@ import re
 
 def entry_filter(entry):
     if re.search(u'^(PR|AD)(:|：)', entry['title']):
-        print 'delete PR entry - %s' % entry['title']
+        #print 'delete PR entry - %s' % entry['title']
         return None
     return entry
 

--- a/gnews.py
+++ b/gnews.py
@@ -6,10 +6,7 @@ import renderer
 import fetcher
 import os.path
 import urllib
-
-def _log(*args):
-    "log helper function"
-    print ' '.join(args)
+from logger import log
 
 def main():
     "gnews's main function"
@@ -46,7 +43,7 @@ def main():
     entries.sort(cmp_entries)
 
     for e in entries:
-        print e["date"]
+        log(e["date"])
 
     # do rendering
     params = {'tags':tags, 'page':{}, 'sorted_tags':sorted_tags}
@@ -84,7 +81,7 @@ def do_rendering(page_type, filename, entries, params):
         else:
             output_fullpath = os.path.join(output_dir, filename % page)
 
-        _log('generate ' + output_fullpath + '...')
+        log('generate ' + output_fullpath + '...')
         f = open(output_fullpath, "w")
         html = r.render(tmpl, entries[start:end], params)
         f.write(html)

--- a/renderer.py
+++ b/renderer.py
@@ -9,6 +9,7 @@ import dateutil.parser
 
 from config import config, target_rss
 from propertizer import propertize
+from logger import log
 
 def date_format(date):
     #dt = dateutil.parser.parse(date)
@@ -47,9 +48,9 @@ class Renderer(object):
         except:
             traceback = RichTraceback()
             for (filename, lineno, function, line) in traceback.traceback:
-                print "File %s, line %s, in %s" % (filename, lineno, function)
-                print line, "\n"
-            print "%s: %s" % (str(traceback.error.__class__.__name__), traceback.error)
+                log("File %s, line %s, in %s" % (filename, lineno, function))
+                log(line, "\n")
+            log("%s: %s" % (str(traceback.error.__class__.__name__), traceback.error))
             sys.exit(-1)
         return result