← Back to branch summary

~mnordhoff/loggerhead/cheezum

« back to all changes in this revision

Viewing changes to loggerhead/controllers/__init__.py

  • Committer: Matt Nordhoff
  • Date: 2010-05-04 02:22:51 UTC
  • mfrom: (164.152.7 integration)
  • Revision ID: mnordhoff@mattnordhoff.com-20100504022251-ekbb12orq2slu4ah
Merge lp:~jameinel/loggerhead/integration.

Requires bzr-history-db now.

There were some conflicts, but I think I got 'em right. I chopped out the logging changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/controllers/__init__.py
92
92
 
93
93
        vals.update(self.get_values(path, kwargs, headers))
94
94
 
95
 
        self.log.info('Getting information for %s: %r secs' % (
 
95
        self.log.info('Getting information for %s: %.3f secs' % (
96
96
            self.__class__.__name__, time.time() - z))
97
97
        if 'Content-Type' not in headers:
98
98
            headers['Content-Type'] = 'text/html'
103
103
        template.expand_into(w, **vals)
104
104
        w.flush()
105
105
        self.log.info(
106
 
            'Rendering %s: %r secs, %s bytes' % (
 
106
            'Rendering %s: %.3f secs, %s bytes' % (
107
107
                self.__class__.__name__, time.time() - z, w.bytes))
108
108
        return []
109
109