diff --git a/overviewer.py b/overviewer.py index b005394..6abb873 100755 --- a/overviewer.py +++ b/overviewer.py @@ -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) - logging.debug("Starting to generate textures") + LOG.debug("Starting to generate textures") tex.generate() - logging.debug("Finished generating textures") + LOG.debug("Finished generating textures") texcache[texopts_key] = tex else: tex = texcache[texopts_key] diff --git a/overviewer_core/assetmanager.py b/overviewer_core/assetmanager.py index b37857d..64e94e3 100644 --- a/overviewer_core/assetmanager.py +++ b/overviewer_core/assetmanager.py @@ -67,7 +67,7 @@ directory. codecs.lookup(self.preferredencoding) except LookupError: self.preferredencoding = "utf_8" - logging.debug("Preferred enoding set to: %s", self.preferredencoding) + LOG.debug("Preferred enoding set to: %s", self.preferredencoding) def get_tileset_config(self, name): "Return the correct dictionary from the parsed overviewerConfig.js" diff --git a/overviewer_core/aux_files/genPOI.py b/overviewer_core/aux_files/genPOI.py index b049463..3d35f37 100755 --- a/overviewer_core/aux_files/genPOI.py +++ b/overviewer_core/aux_files/genPOI.py @@ -59,7 +59,7 @@ def parseBucketChunks(bucket, rset): if i == 250: i = 0 cnt = 250 + 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); + 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); return pois @@ -93,7 +93,7 @@ def handleEntities(rset, outputdir, render, rname, config): buckets[i].append([x,z]) for b in buckets: - logging.info("Buckets has %d entries", len(b)); + LOG.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) - logging.info("All the threads completed") + LOG.info("All the threads completed") # Fix up all the quests in the reset for data in results: diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 34f8989..5eb7d04 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -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: logging.info('filename: ' + filename + ' ; path: ' + path) + if verbose: LOG.info('filename: ' + filename + ' ; path: ' + path) if os.path.isfile(path): return path return None - if verbose: logging.info('search_zip_paths: ' + ', '.join(search_zip_paths)) + if verbose: LOG.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: logging.info("Found (cached) %s in '%s'", jarfilename, self.jarpath) + if verbose: LOG.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: logging.info("Found %s in '%s'", packfilename, self.find_file_local_path) + if verbose: LOG.info("Found %s in '%s'", packfilename, self.find_file_local_path) return pack.open(packfilename) except (KeyError, IOError): pass