diff options
Diffstat (limited to 'patchtracker/ReqHandler.py')
-rwxr-xr-x | patchtracker/ReqHandler.py | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/patchtracker/ReqHandler.py b/patchtracker/ReqHandler.py index 844e108..d978953 100755 --- a/patchtracker/ReqHandler.py +++ b/patchtracker/ReqHandler.py @@ -6,7 +6,6 @@ import sys import patchtracker.Conf as Conf from patchtracker.Templates import ErrorTemplate, LetterTocTemplate, FrontPageTemplate, SearchResultsTemplate -from patchtracker.CacheObject import CacheObject, CacheMissException import patchtracker.DB as DB from patchtracker.DB import PatchTrackerDB import patchtracker.SourceArchive as SourceArchive @@ -80,12 +79,10 @@ class CmdHandler: def __init__(self, env): self.headers = [] uri = Conf.root_url+env['PATH_INFO'] - self.cacheobj = None #print "Accept:",env['HTTP_ACCEPT'] args = uri[len(Conf.root_url)+1:].split("/") cmdarg = args[0] - cacheable = False if cmdarg == "index": self.cmd = IndexCmd(args[1:]) elif cmdarg == "jump": @@ -98,22 +95,12 @@ class CmdHandler: else: self.cmd = ErrorCmd("invalid command/location '%s'"%(cmdarg), "404 Not found") - if Conf.caching and cacheable: - self.cacheobj = CacheObject(key=uri) - self.headers.append( ('Content-type', self.cmd.content_type) ) self.status = self.cmd.status def output(self): result = None - try: - if self.cacheobj: - result = self.cacheobj.get() - else: - result = self.cmd.output() - except CacheMissException: - result = self.cmd.output() - self.cacheobj.put(result) + result = self.cmd.output() return result |