cubicweb: comparison server/serverctl.py

equal deleted inserted replaced

-:c51be1cf8317
+:9806571ea790
 :organization: Logilab
 :copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), license is LGPL v2.
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 :license: GNU Lesser General Public License, v2.1 - http://www.gnu.org/licenses
 """
-__docformat__ = "restructuredtext en"
+__docformat__ = 'restructuredtext en'
 import sys
 import os
 from logilab.common.configuration import Configuration
 config.write_sources_file(sourcescfg)
 # remember selected cubes for later initialization of the database
 config.write_bootstrap_cubes_file(cubes)
 def postcreate(self):
-if confirm('Do you want to run db-create to create the "system database" ?'):
+if confirm('Do you want to run db-create to create the system database ?'):
 verbosity = (self.config.mode == 'installed') and 'y' or 'n'
 cmd_run('db-create', self.config.appid, '--verbose=%s' % verbosity)
 else:
 print ('-> nevermind, you can do it later with '
 '"cubicweb-ctl db-create %s".' % self.config.appid)
 """
 name = 'db-create'
 arguments = '<instance>'
 options = (
-("create-db",
+('create-db',
-{'short': 'c', 'type': "yn", 'metavar': '<y or n>',
+{'short': 'c', 'type': 'yn', 'metavar': '<y or n>',
 'default': True,
 'help': 'create the database (yes by default)'}),
-("verbose",
+('verbose',
 {'short': 'v', 'type' : 'yn', 'metavar': '<verbose>',
 'default': 'n',
 'help': 'verbose mode: will ask all possible configuration questions',
 }
 ),
 def run(self, args):
 """run the command with its specific arguments"""
 from logilab.common.adbh import get_adv_func_helper
 from indexer import get_indexer
 verbose = self.get('verbose')
-appid = pop_arg(args, msg="No instance specified !")
+appid = pop_arg(args, msg='No instance specified !')
 config = ServerConfiguration.config_for(appid)
 create_db = self.config.create_db
 source = config.sources()['system']
 driver = source['db-driver']
 helper = get_adv_func_helper(driver)
 if create_db:
-print '\n'+underline_title('Creating the "system database"')
+print '\n'+underline_title('Creating the system database')
 # connect on the dbms system base to create our base
 dbcnx = _db_sys_cnx(source, 'CREATE DATABASE and / or USER', verbose=verbose)
 cursor = dbcnx.cursor()
 try:
 if helper.users_support:
 helper.create_language(cursor, extlang)
 cursor.close()
 cnx.commit()
 print '-> database for instance %s created and necessary extensions installed.' % appid
 print
-if confirm('Do you want to run db-init to initialize the "system database" ?'):
+if confirm('Do you want to run db-init to initialize the system database ?'):
 cmd_run('db-init', config.appid)
 else:
 print ('-> nevermind, you can do it later with '
 '"cubicweb-ctl db-init %s".' % self.config.appid)
 """
 name = 'db-init'
 arguments = '<instance>'
 options = (
-("drop",
+('drop',
 {'short': 'd', 'action': 'store_true',
 'default': False,
 'help': 'insert drop statements to remove previously existant \
 tables, indexes... (no by default)'}),
 )
 def run(self, args):
-print '\n'+underline_title('Initializing the "system database"')
+print '\n'+underline_title('Initializing the system database')
 from cubicweb.server import init_repository
-appid = pop_arg(args, msg="No instance specified !")
+appid = pop_arg(args, msg='No instance specified !')
 config = ServerConfiguration.config_for(appid)
 init_repository(config, drop=self.config.drop)
 class GrantUserOnInstanceCommand(Command):
 """
 name = 'db-grant-user'
 arguments = '<instance> <user>'
 options = (
-("set-owner",
+('set-owner',
-{'short': 'o', 'type' : "yn", 'metavar' : '<yes or no>',
+{'short': 'o', 'type' : 'yn', 'metavar' : '<yes or no>',
 'default' : False,
 'help': 'Set the user as tables owner if yes (no by default).'}
 ),
 )
 def run(self, args):
 """run the command with its specific arguments"""
 from cubicweb.server.sqlutils import sqlexec, sqlgrants
-appid = pop_arg(args, 1, msg="No instance specified !")
+appid = pop_arg(args, 1, msg='No instance specified !')
-user = pop_arg(args, msg="No user specified !")
+user = pop_arg(args, msg='No user specified !')
 config = ServerConfiguration.config_for(appid)
 source = config.sources()['system']
 set_owner = self.config.set_owner
 cnx = system_source_cnx(source, special_privs='GRANT')
 cursor = cnx.cursor()
 def run(self, args):
 """run the command with its specific arguments"""
 from cubicweb.server.sqlutils import sqlexec, SQL_PREFIX
 from cubicweb.server.utils import crypt_password, manager_userpasswd
-appid = pop_arg(args, 1, msg="No instance specified !")
+appid = pop_arg(args, 1, msg='No instance specified !')
 config = ServerConfiguration.config_for(appid)
 sourcescfg = config.read_sources_file()
 try:
 adminlogin = sourcescfg['admin']['login']
 except KeyError:
 """
 name = 'start-repository'
 arguments = '<instance>'
 options = (
-("debug",
+('debug',
 {'short': 'D', 'action' : 'store_true',
 'help': 'start server in debug mode.'}),
 )
 def run(self, args):
 from cubicweb.server.server import RepositoryServer
-appid = pop_arg(args, msg="No instance specified !")
+appid = pop_arg(args, msg='No instance specified !')
 config = ServerConfiguration.config_for(appid)
 debug = self.config.debug
 # create the server
 server = RepositoryServer(config, debug)
 # go ! (don't daemonize in debug mode)
 server.connect(config['host'], 0)
 server.run()
 def _remote_dump(host, appid, output, sudo=False):
+# XXX generate unique/portable file name
 dmpcmd = 'cubicweb-ctl db-dump -o /tmp/%s.dump %s' % (appid, appid)
 if sudo:
 dmpcmd = 'sudo %s' % (dmpcmd)
 dmpcmd = 'ssh -t %s "%s"' % (host, dmpcmd)
 print dmpcmd
 raise ExecutionError('Error while deleting remote dump')
 def _local_dump(appid, output):
 config = ServerConfiguration.config_for(appid)
 # schema=1 to avoid unnecessary schema loading
-mih = config.migration_handler(connect=False, schema=1)
+mih = config.migration_handler(connect=False, schema=1, verbosity=1)
 mih.backup_database(output, askconfirm=False)
+mih.shutdown()
-def _local_restore(appid, backupfile, drop):
+def _local_restore(appid, backupfile, drop, systemonly=True):
 config = ServerConfiguration.config_for(appid)
+config.verbosity = 1 # else we won't be asked for confirmation on problems
 # schema=1 to avoid unnecessary schema loading
-mih = config.migration_handler(connect=False, schema=1)
+mih = config.migration_handler(connect=False, schema=1, verbosity=1)
-mih.restore_database(backupfile, drop)
+mih.restore_database(backupfile, drop, systemonly, askconfirm=False)
 repo = mih.repo_connect()
 # version of the database
 dbversions = repo.get_versions()
 mih.shutdown()
 if not dbversions:
 return 'needapplupgrade'
 for cube in config.cubes():
 try:
 softversion = config.cube_version(cube)
 except ConfigurationError:
-print "-> Error: no cube version information for %s, please check that the cube is installed." % cube
+print '-> Error: no cube version information for %s, please check that the cube is installed.' % cube
 continue
 try:
 applversion = vcconf[cube]
 except KeyError:
-print "-> Error: no cube version information for %s in version configuration." % cube
+print '-> Error: no cube version information for %s in version configuration.' % cube
 continue
 if softversion == applversion:
 continue
 if softversion > applversion:
 return 'needsoftupgrade'
 """
 name = 'db-dump'
 arguments = '<instance>'
 options = (
-("output",
+('output',
-{'short': 'o', 'type' : "string", 'metavar' : '<file>',
+{'short': 'o', 'type' : 'string', 'metavar' : '<file>',
 'default' : None,
 'help': 'Specify the backup file where the backup will be stored.'}
 ),
 ('sudo',
 {'short': 's', 'action' : 'store_true',
 'help': 'Use sudo on the remote host.'}
 ),
 )
 def run(self, args):
-appid = pop_arg(args, 1, msg="No instance specified !")
+appid = pop_arg(args, 1, msg='No instance specified !')
 if ':' in appid:
 host, appid = appid.split(':')
 _remote_dump(host, appid, self.config.output, self.config.sudo)
 else:
 _local_dump(appid, self.config.output)
 """
 name = 'db-restore'
 arguments = '<instance> <backupfile>'
 options = (
-("no-drop",
+('no-drop',
-{'short': 'n', 'action' : 'store_true',
+{'short': 'n', 'action' : 'store_true', 'default' : False,
-'default' : False,
 'help': 'for some reason the database doesn\'t exist and so '
 'should not be dropped.'}
 ),
+('restore-all',
+{'short': 'r', 'action' : 'store_true', 'default' : False,
+'help': 'restore everything, eg not only the system source database '
+'but also data for all sources supporting backup/restore and custom '
+'instance data. In that case, <backupfile> is expected to be the '
+'timestamp of the backup to restore, not a file'}
+),
 )
 def run(self, args):
-appid = pop_arg(args, 1, msg="No instance specified !")
+appid = pop_arg(args, 1, msg='No instance specified !')
-backupfile = pop_arg(args, msg="No backup file specified !")
+backupfile = pop_arg(args, msg='No backup file or timestamp specified !')
-_local_restore(appid, backupfile, not self.config.no_drop)
+_local_restore(appid, backupfile,
+drop=not self.config.no_drop,
+systemonly=not self.config.restore_all)
 class DBCopyCommand(Command):
 """Copy the system database of an instance (backup and restore).
 """
 name = 'db-copy'
 arguments = '<src-instance> <dest-instance>'
 options = (
-("no-drop",
+('no-drop',
 {'short': 'n', 'action' : 'store_true',
 'default' : False,
 'help': 'For some reason the database doesn\'t exist and so '
 'should not be dropped.'}
 ),
-("keep-dump",
+('keep-dump',
 {'short': 'k', 'action' : 'store_true',
 'default' : False,
 'help': 'Specify that the dump file should not be automatically removed.'}
 ),
 ('sudo',
 ),
 )
 def run(self, args):
 import tempfile
-srcappid = pop_arg(args, 1, msg="No source instance specified !")
+srcappid = pop_arg(args, 1, msg='No source instance specified !')
-destappid = pop_arg(args, msg="No destination instance specified !")
+destappid = pop_arg(args, msg='No destination instance specified !')
 _, output = tempfile.mkstemp()
 if ':' in srcappid:
 host, srcappid = srcappid.split(':')
 _remote_dump(host, srcappid, output, self.config.sudo)
 else:
 """
 name = 'db-check'
 arguments = '<instance>'
 options = (
-("checks",
+('checks',
-{'short': 'c', 'type' : "csv", 'metavar' : '<check list>',
+{'short': 'c', 'type' : 'csv', 'metavar' : '<check list>',
 'default' : ('entities', 'relations', 'metadata', 'schema', 'text_index'),
 'help': 'Comma separated list of check to run. By default run all \
 checks, i.e. entities, relations, text_index and metadata.'}
 ),
-("autofix",
+('autofix',
-{'short': 'a', 'type' : "yn", 'metavar' : '<yes or no>',
+{'short': 'a', 'type' : 'yn', 'metavar' : '<yes or no>',
 'default' : False,
 'help': 'Automatically correct integrity problems if this option \
 is set to "y" or "yes", else only display them'}
 ),
-("reindex",
+('reindex',
-{'short': 'r', 'type' : "yn", 'metavar' : '<yes or no>',
+{'short': 'r', 'type' : 'yn', 'metavar' : '<yes or no>',
 'default' : False,
 'help': 're-indexes the database for full text search if this \
 option is set to "y" or "yes" (may be long for large database).'}
 ),
-("force",
+('force',
-{'short': 'f', 'action' : "store_true",
+{'short': 'f', 'action' : 'store_true',
 'default' : False,
 'help': 'don\'t check instance is up to date.'}
 ),
 )
 def run(self, args):
 from cubicweb.server.checkintegrity import check
-appid = pop_arg(args, 1, msg="No instance specified !")
+appid = pop_arg(args, 1, msg='No instance specified !')
 config = ServerConfiguration.config_for(appid)
 config.repairing = self.config.force
 repo, cnx = repo_cnx(config)
 check(repo, cnx,
 self.config.checks, self.config.reindex, self.config.autofix)
 options = ()
 def run(self, args):
 from cubicweb.server.checkintegrity import reindex_entities
-appid = pop_arg(args, 1, msg="No instance specified !")
+appid = pop_arg(args, 1, msg='No instance specified !')
 config = ServerConfiguration.config_for(appid)
 repo, cnx = repo_cnx(config)
 session = repo._get_session(cnx.sessionid, setpool=True)
 reindex_entities(repo.schema, session)
 cnx.commit()
 """
 name = 'schema-sync'
 arguments = '<instance>'
 def run(self, args):
-appid = pop_arg(args, msg="No instance specified !")
+appid = pop_arg(args, msg='No instance specified !')
 config = ServerConfiguration.config_for(appid)
 mih = config.migration_handler()
 mih.cmd_synchronize_schema()

changeset 2493	9806571ea790
parent 2476	1294a6bdf3bf
child 2507	45248d0ad8a0