tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Logging/debugging improvements. 

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-10-15 23:02:07 +01:00
parent 9f7469c49b
commit c5522f9224
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/allmydata/frontends/magic_folder.py
View File

@ -123,14 +123,14 @@ class QueueMixin(HookMixin):
return extend_filepath(self._local_filepath, relpath_u.split(u"/")) return extend_filepath(self._local_filepath, relpath_u.split(u"/"))
def _get_relpath(self, filepath): def _get_relpath(self, filepath):
print "_get_relpath(%r)" % (filepath,) self._log("_get_relpath(%r)" % (filepath,))
segments = unicode_segments_from(filepath, self._local_filepath) segments = unicode_segments_from(filepath, self._local_filepath)
print "segments = %r" % (segments,) self._log("segments = %r" % (segments,))
return u"/".join(segments) return u"/".join(segments)
def _count(self, counter_name, delta=1): def _count(self, counter_name, delta=1):
ctr = 'magic_folder.%s.%s' % (self._name, counter_name) ctr = 'magic_folder.%s.%s' % (self._name, counter_name)
print "%r += %r" % (ctr, delta) self._log("%s += %r" % (counter_name, delta))
self._client.stats_provider.count(ctr, delta) self._client.stats_provider.count(ctr, delta)
def _log(self, msg): def _log(self, msg):
@ -140,7 +140,7 @@ class QueueMixin(HookMixin):
#open("events", "ab+").write(msg) #open("events", "ab+").write(msg)
def _append_to_deque(self, relpath_u): def _append_to_deque(self, relpath_u):
print "_append_to_deque(%r)" % (relpath_u,) self._log("_append_to_deque(%r)" % (relpath_u,))
if relpath_u in self._pending or magicpath.should_ignore_file(relpath_u): if relpath_u in self._pending or magicpath.should_ignore_file(relpath_u):
return return
self._deque.append(relpath_u) self._deque.append(relpath_u)
@ -222,12 +222,12 @@ class Uploader(QueueMixin):
self._log("start_scanning") self._log("start_scanning")
self.is_ready = True self.is_ready = True
self._pending = self._db.get_all_relpaths() self._pending = self._db.get_all_relpaths()
print "all_files %r" % (self._pending) self._log("all_files %r" % (self._pending))
d = self._scan(u"") d = self._scan(u"")
def _add_pending(ign): def _add_pending(ign):
# This adds all of the files that were in the db but not already processed # This adds all of the files that were in the db but not already processed
# (normally because they have been deleted on disk). # (normally because they have been deleted on disk).
print "adding %r" % (self._pending) self._log("adding %r" % (self._pending))
self._deque.extend(self._pending) self._deque.extend(self._pending)
d.addCallback(_add_pending) d.addCallback(_add_pending)
d.addCallback(lambda ign: self._turn_deque()) d.addCallback(lambda ign: self._turn_deque())
@ -286,7 +286,7 @@ class Uploader(QueueMixin):
fp = self._get_filepath(relpath_u) fp = self._get_filepath(relpath_u)
pathinfo = get_pathinfo(unicode_from_filepath(fp)) pathinfo = get_pathinfo(unicode_from_filepath(fp))
print "pending = %r, about to remove %r" % (self._pending, relpath_u) self._log("pending = %r, about to remove %r" % (self._pending, relpath_u))
self._pending.remove(relpath_u) self._pending.remove(relpath_u)
encoded_path_u = magicpath.path2magic(relpath_u) encoded_path_u = magicpath.path2magic(relpath_u)
@ -370,7 +370,6 @@ class Uploader(QueueMixin):
self._count('objects_succeeded') self._count('objects_succeeded')
return res return res
def _failed(f): def _failed(f):
print f
self._count('objects_failed') self._count('objects_failed')
self._log("%r while processing %r" % (f, relpath_u)) self._log("%r while processing %r" % (f, relpath_u))
return f return f
@ -410,7 +409,7 @@ class Downloader(QueueMixin):
self._download_scan_batch = {} # path -> [(filenode, metadata)] self._download_scan_batch = {} # path -> [(filenode, metadata)]
def start_scanning(self): def start_scanning(self):
self._log("\nstart_scanning") self._log("start_scanning")
files = self._db.get_all_relpaths() files = self._db.get_all_relpaths()
self._log("all files %s" % files) self._log("all files %s" % files)
@ -521,14 +520,14 @@ class Downloader(QueueMixin):
return collective_dirmap_d return collective_dirmap_d
def _add_batch_to_download_queue(self, result): def _add_batch_to_download_queue(self, result):
print "result = %r" % (result,) self._log("result = %r" % (result,))
print "deque = %r" % (self._deque,) self._log("deque = %r" % (self._deque,))
self._deque.extend(result) self._deque.extend(result)
print "deque after = %r" % (self._deque,) self._log("deque after = %r" % (self._deque,))
self._count('objects_queued', len(result)) self._count('objects_queued', len(result))
print "pending = %r" % (self._pending,) self._log("pending = %r" % (self._pending,))
self._pending.update(map(lambda x: x[0], result)) self._pending.update(map(lambda x: x[0], result))
print "pending after = %r" % (self._pending,) self._log("pending after = %r" % (self._pending,))
def _filter_scan_batch(self, result): def _filter_scan_batch(self, result):
extension = [] # consider whether this should be a dict extension = [] # consider whether this should be a dict
@ -546,6 +545,7 @@ class Downloader(QueueMixin):
return d return d
def _process(self, item, now=None): def _process(self, item, now=None):
self._log("_process(%r)" % (item,))
if now is None: if now is None:
now = time.time() now = time.time()
(relpath_u, file_node, metadata) = item (relpath_u, file_node, metadata) = item

3
src/allmydata/magicfolderdb.py
View File

@ -108,6 +108,7 @@ class MagicFolderDB(object):
return row[0] return row[0]
def did_upload_version(self, relpath_u, version, last_uploaded_uri, last_downloaded_uri, last_downloaded_timestamp, pathinfo): def did_upload_version(self, relpath_u, version, last_uploaded_uri, last_downloaded_uri, last_downloaded_timestamp, pathinfo):
print "%r.did_upload_version(%r, %r, %r, %r, %r, %r)" % (self, relpath_u, version, last_uploaded_uri, last_downloaded_uri, last_downloaded_timestamp, pathinfo)
try: try:
print "insert" print "insert"
self.cursor.execute("INSERT INTO local_files VALUES (?,?,?,?,?,?,?,?)", self.cursor.execute("INSERT INTO local_files VALUES (?,?,?,?,?,?,?,?)",
@ -119,7 +120,7 @@ class MagicFolderDB(object):
" WHERE path=?", " WHERE path=?",
(pathinfo.size, pathinfo.mtime, pathinfo.ctime, version, last_uploaded_uri, last_downloaded_uri, last_downloaded_timestamp, relpath_u)) (pathinfo.size, pathinfo.mtime, pathinfo.ctime, version, last_uploaded_uri, last_downloaded_uri, last_downloaded_timestamp, relpath_u))
self.connection.commit() self.connection.commit()
print "commited" print "committed"
def is_new_file(self, pathinfo, relpath_u): def is_new_file(self, pathinfo, relpath_u):
""" """