openstack
/
glance
Code Issues Proposed changes

Better logging

This commit is contained in:
Rick Harris 2011-02-02 06:29:41 +00:00
parent d923a04175
commit 511b109794
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
glance/registry/db/migrate_repo/schema.py
View File

@ -19,9 +19,15 @@
Various conveniences used for migration scripts Various conveniences used for migration scripts
""" """
import logging
import sqlalchemy.types import sqlalchemy.types
from sqlalchemy.schema import MetaData from sqlalchemy.schema import MetaData
logger = logging.getLogger('glance.registry.db.migrate_repo.schema')
String = lambda length: sqlalchemy.types.String( String = lambda length: sqlalchemy.types.String(
length=length, convert_unicode=False, assert_unicode=None, length=length, convert_unicode=False, assert_unicode=None,
unicode_error=None, _warn_on_bytestring=False) unicode_error=None, _warn_on_bytestring=False)
@ -42,3 +48,16 @@ Integer = lambda: sqlalchemy.types.Integer()
meta = MetaData() meta = MetaData()
def create_tables(tables):
for table in tables:
logger.info("creating table %(table)s" % locals())
table.create()
def drop_tables(tables):
for table in tables:
logger.info("dropping table %(table)s" % locals())
table.drop()

12
glance/registry/db/migrate_repo/versions/001_add_images_table.py
View File

@ -16,14 +16,16 @@
# under the License. # under the License.
import logging import logging
from sqlalchemy.schema import (Column, MetaData, Table) from sqlalchemy.schema import (Column, Table)
from glance.registry.db.migrate_repo.schema import (Boolean, from glance.registry.db.migrate_repo.schema import (Boolean,
DateTime, DateTime,
Integer, Integer,
String, String,
Text, Text,
meta) meta,
create_tables,
drop_tables)
def define_tables(): def define_tables():
@ -47,12 +49,10 @@ def define_tables():
def upgrade(migrate_engine): def upgrade(migrate_engine):
meta.bind = migrate_engine meta.bind = migrate_engine
tables = define_tables() tables = define_tables()
for table in tables: create_tables(tables)
table.create()
def downgrade(migrate_engine): def downgrade(migrate_engine):
meta.bind = migrate_engine meta.bind = migrate_engine
tables = define_tables() tables = define_tables()
for table in reversed(tables): drop_tables(tables)
table.drop()

13
glance/registry/db/migrate_repo/versions/002_add_image_properties_table.py
View File

@ -16,15 +16,16 @@
# under the License. # under the License.
import logging import logging
from sqlalchemy.schema import (Column, ForeignKey, MetaData, Table, from sqlalchemy.schema import (Column, ForeignKey, Table, UniqueConstraint)
UniqueConstraint)
from glance.registry.db.migrate_repo.schema import (Boolean, from glance.registry.db.migrate_repo.schema import (Boolean,
DateTime, DateTime,
Integer, Integer,
String, String,
Text, Text,
meta) meta,
create_tables,
drop_tables)
def define_tables(): def define_tables():
@ -46,12 +47,10 @@ def define_tables():
def upgrade(migrate_engine): def upgrade(migrate_engine):
meta.bind = migrate_engine meta.bind = migrate_engine
tables = define_tables() tables = define_tables()
for table in tables: create_tables(tables)
table.create()
def downgrade(migrate_engine): def downgrade(migrate_engine):
meta.bind = migrate_engine meta.bind = migrate_engine
tables = define_tables() tables = define_tables()
for table in reversed(tables): drop_tables(tables)
table.drop()