diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-03-12 18:38:35 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-03-12 18:38:35 -0500 |
| commit | 849cf91fc8feeed308b5f54fd53d1940bf23058b (patch) | |
| tree | b7fdd37c737d5e649c04eec3a0b12259846a4177 | |
| parent | 1f36e6bee969fff96bb925673c045983618b60d0 (diff) | |
| parent | cc9f9a1dd3e8f3d0aa642e2a987a9d075e59d3d8 (diff) | |
| download | mediagoblin-849cf91fc8feeed308b5f54fd53d1940bf23058b.tar.lz mediagoblin-849cf91fc8feeed308b5f54fd53d1940bf23058b.tar.xz mediagoblin-849cf91fc8feeed308b5f54fd53d1940bf23058b.zip | |
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
| -rw-r--r-- | mediagoblin/tools/request.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mediagoblin/tools/request.py b/mediagoblin/tools/request.py index a45f716a..ae372c92 100644 --- a/mediagoblin/tools/request.py +++ b/mediagoblin/tools/request.py @@ -14,8 +14,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +import logging from mediagoblin.db.util import ObjectId, InvalidId +_log = logging.getLogger(__name__) + + def setup_user_in_request(request): """ Examine a request and tack on a request.user parameter if that's @@ -30,12 +34,12 @@ def setup_user_in_request(request): except InvalidId: user = None else: - user = request.db.User.one({'_id': oid}) + user = request.db.User.find_one({'_id': oid}) if not user: # Something's wrong... this user doesn't exist? Invalidate # this session. - print "Killing session for %r" % request.session['user_id'] + _log.warn("Killing session for user id %r", request.session['user_id']) request.session.invalidate() request.user = user |