← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/controllers/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2011-03-16 12:24:06 UTC
  • mfrom: (436 trunk-rich)
  • mto: This revision was merged to the branch mainline in revision 438.
  • Revision ID: john@arbash-meinel.com-20110316122406-xdv5771vlih6s76q
Merge trunk and resolve NEWS conflict.

Show diffs side-by-side

added added

removed removed

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