[Checkins] SVN: relstorage/trunk/ Log to stderr in zodbpack. Also fixed a comment and a log name.

[Shane Hathaway]

Log message for revision 119976:
  Log to stderr in zodbpack.  Also fixed a comment and a log name.
  

Changed:
  U   relstorage/trunk/CHANGES.txt
  U   relstorage/trunk/relstorage/adapters/packundo.py
  U   relstorage/trunk/relstorage/zodbconvert.py
  U   relstorage/trunk/relstorage/zodbpack.py

-=-
Modified: relstorage/trunk/CHANGES.txt
===================================================================
--- relstorage/trunk/CHANGES.txt	2011-01-27 10:42:11 UTC (rev 119975)
+++ relstorage/trunk/CHANGES.txt	2011-01-27 11:11:26 UTC (rev 119976)
@@ -5,6 +5,8 @@
 - Added more logging during zodbconvert to show that something is
   happening and give an indication of how far along the process is.
 
+- Enabled logging to stderr in zodbpack.
+
 - Fixed a missing import in the blob cache cleanup code.
 
 1.5.0a1 (2010-10-21)

Modified: relstorage/trunk/relstorage/adapters/packundo.py
===================================================================
--- relstorage/trunk/relstorage/adapters/packundo.py	2011-01-27 10:42:11 UTC (rev 119975)
+++ relstorage/trunk/relstorage/adapters/packundo.py	2011-01-27 11:11:26 UTC (rev 119976)
@@ -945,7 +945,7 @@
     def pack(self, pack_tid, options, sleep=None, packed_func=None):
         """Run garbage collection.
 
-        Requires the information provided by _pre_gc.
+        Requires the information provided by pre_pack.
         """
         # Read committed mode is sufficient.
         conn, cursor = self.connmanager.open()

Modified: relstorage/trunk/relstorage/zodbconvert.py
===================================================================
--- relstorage/trunk/relstorage/zodbconvert.py	2011-01-27 10:42:11 UTC (rev 119975)
+++ relstorage/trunk/relstorage/zodbconvert.py	2011-01-27 11:11:26 UTC (rev 119976)
@@ -35,7 +35,7 @@
 </schema>
 """
 
-log = logging.getLogger("relstorage.zodbconvert")
+log = logging.getLogger("zodbconvert")
 
 
 def storage_has_data(storage):

Modified: relstorage/trunk/relstorage/zodbpack.py
===================================================================
--- relstorage/trunk/relstorage/zodbpack.py	2011-01-27 10:42:11 UTC (rev 119975)
+++ relstorage/trunk/relstorage/zodbpack.py	2011-01-27 11:11:26 UTC (rev 119976)
@@ -16,6 +16,7 @@
 """
 
 from StringIO import StringIO
+import logging
 import optparse
 import sys
 import time
@@ -30,6 +31,9 @@
 </schema>
 """
 
+log = logging.getLogger("zodbpack")
+
+
 def main(argv=sys.argv):
     parser = optparse.OptionParser(description=__doc__,
         usage="%prog [options] config_file")
@@ -42,14 +46,22 @@
     if len(args) != 1:
         parser.error("The name of one configuration file is required.")
 
+    logging.basicConfig(
+        level=logging.INFO,
+        format="%(asctime)s [%(name)s] %(levelname)s %(message)s")
+
     schema = ZConfig.loadSchemaFile(StringIO(schema_xml))
     config, handler = ZConfig.loadConfig(schema, args[0])
 
     t = time.time() - float(options.days) * 86400.0
     for s in config.storages:
+        name = '%s (%s)' % ((s.name or 'storage'), s.__class__.__name__)
+        log.info("Opening %s...", name)
         storage = s.open()
+        log.info("Packing %s.", name)
         storage.pack(t, ZODB.serialize.referencesf)
         storage.close()
+        log.info("Packed %s.", name)
 
 if __name__ == '__main__':
     main()