Commit f4b41113 authored by Shane Hathaway's avatar Shane Hathaway

In FTP, log any failed attempts to stat subobjects.

Still show the directory, though.
parent bf1ee86c
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
############################################################################## ##############################################################################
__doc__="""Object Manager __doc__="""Object Manager
$Id: ObjectManager.py,v 1.173 2004/03/23 06:51:13 Zen Exp $""" $Id: ObjectManager.py,v 1.174 2004/03/31 22:41:13 shane Exp $"""
__version__='$Revision: 1.173 $'[11:-2] __version__='$Revision: 1.174 $'[11:-2]
import App.Management, Acquisition, Globals, CopySupport, Products import App.Management, Acquisition, Globals, CopySupport, Products
import os, App.FactoryDispatcher, re, Products import os, App.FactoryDispatcher, re, Products
...@@ -613,13 +613,14 @@ class ObjectManager( ...@@ -613,13 +613,14 @@ class ObjectManager(
for k,v in files: for k,v in files:
# Note that we have to tolerate failure here, because # Note that we have to tolerate failure here, because
# Broken objects won't stat correctly. If an object fails # Broken objects won't stat correctly. If an object fails
# to be able to stat itself, we will ignore it. # to be able to stat itself, we will ignore it, but log
try: stat=marshal.loads(v.manage_FTPstat(REQUEST)) # the error.
try:
stat=marshal.loads(v.manage_FTPstat(REQUEST))
except: except:
LOG("FTP", ERROR, "Failed to stat file '%s'" % k,
error=sys.exc_info())
stat=None stat=None
if k != "Control_Panel":
__traceback_info__ = (k, v)
raise
if stat is not None: if stat is not None:
out=out+((k,stat),) out=out+((k,stat),)
return marshal.dumps(out) return marshal.dumps(out)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment