LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Revert "used LOG instead of logging on a few stragglers"

Browse Source 
This reverts commit 144cff18e3.
This commit is contained in:
Aaron Griffith
2013-12-02 07:35:10 -05:00
parent 2967032ecc
commit a8a2a191b8
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
overviewer.py
View File

@@ -433,9 +433,9 @@ dir but you forgot to put quotes around the directory, since it contains spaces.
texopts_key = tuple(texopts.items())
if texopts_key not in texcache:
tex = textures.Textures(**texopts)
LOG.debug("Starting to generate textures")
logging.debug("Starting to generate textures")
tex.generate()
LOG.debug("Finished generating textures")
logging.debug("Finished generating textures")
texcache[texopts_key] = tex
else:
tex = texcache[texopts_key]

2
overviewer_core/assetmanager.py
View File

@@ -67,7 +67,7 @@ directory.
codecs.lookup(self.preferredencoding)
except LookupError:
self.preferredencoding = "utf_8"
LOG.debug("Preferred enoding set to: %s", self.preferredencoding)
logging.debug("Preferred enoding set to: %s", self.preferredencoding)
def get_tileset_config(self, name):
"Return the correct dictionary from the parsed overviewerConfig.js"

6
overviewer_core/aux_files/genPOI.py
View File

@@ -59,7 +59,7 @@ def parseBucketChunks(bucket, rset):
if i == 250:
i = 0
cnt = 250 + cnt
LOG.info("Found %d entities and %d tile entities in thread %d so far at %d chunks", len(pois['Entities']), len(pois['TileEntities']), pid, cnt);
logging.info("Found %d entities and %d tile entities in thread %d so far at %d chunks", len(pois['Entities']), len(pois['TileEntities']), pid, cnt);
return pois
@@ -93,7 +93,7 @@ def handleEntities(rset, outputdir, render, rname, config):
buckets[i].append([x,z])
for b in buckets:
LOG.info("Buckets has %d entries", len(b));
logging.info("Buckets has %d entries", len(b));
# create the partial to lock the rset
dest = partial(parseBucketChunks, rset=rset)
@@ -102,7 +102,7 @@ def handleEntities(rset, outputdir, render, rname, config):
pool = Pool(processes=numbuckets)
results = pool.map(dest, buckets)
LOG.info("All the threads completed")
logging.info("All the threads completed")
# Fix up all the quests in the reset
for data in results:

8
overviewer_core/textures.py
View File

@@ -157,12 +157,12 @@ class Textures(object):
def search_dir(base):
"""Search the given base dir for filename, in search_dirs."""
for path in [os.path.join(base, d, filename) for d in ['',] + search_dirs]:
if verbose: LOG.info('filename: ' + filename + ' ; path: ' + path)
if verbose: logging.info('filename: ' + filename + ' ; path: ' + path)
if os.path.isfile(path):
return path
return None
if verbose: LOG.info('search_zip_paths: ' + ', '.join(search_zip_paths))
if verbose: logging.info('search_zip_paths: ' + ', '.join(search_zip_paths))
# we've sucessfully loaded something from here before, so let's quickly try
# this before searching again
@@ -170,7 +170,7 @@ class Textures(object):
for jarfilename in search_zip_paths:
try:
self.jar.getinfo(jarfilename)
if verbose: LOG.info("Found (cached) %s in '%s'", jarfilename, self.jarpath)
if verbose: logging.info("Found (cached) %s in '%s'", jarfilename, self.jarpath)
return self.jar.open(jarfilename)
except (KeyError, IOError), e:
pass
@@ -202,7 +202,7 @@ class Textures(object):
# 2nd try with completed path.
packfilename = 'assets/minecraft/textures/' + packfilename
pack.getinfo(packfilename)
if verbose: LOG.info("Found %s in '%s'", packfilename, self.find_file_local_path)
if verbose: logging.info("Found %s in '%s'", packfilename, self.find_file_local_path)
return pack.open(packfilename)
except (KeyError, IOError):
pass