cubicweb: comparison cwctl.py

equal deleted inserted replaced

-:edfe43ceaa35
+:bd0126d17e83
 status = system('%s %s' % (forkcmd, appid))
 if status:
 print '%s exited with status %s' % (forkcmd, status)
 else:
 self.run_arg(appid)
 # base commands ###############################################################
 class ListCommand(Command):
 """List configurations, cubes and instances.
 print '-> instance %s (%s) deleted.' % (appid, confignames)
 # instance commands ########################################################
-class StartInstanceCommand(InstanceCommand):
+class StartInstanceCommand(InstanceCommandFork):
 """Start the given instances. If no instance is given, start them all.
 <instance>...
 identifiers of the instances to start. If no instance is
 given, start them all.
 }),
 )
 def start_instance(self, appid):
 """start the instance's server"""
-# use get() since start may be used from other commands (eg upgrade)
+debug = self['debug']
-# without all options defined
+force = self['force']
-debug = self.get('debug')
+loglevel = self['loglevel']
-force = self.get('force')
-loglevel = self.get('loglevel')
 config = cwcfg.config_for(appid)
 if loglevel is not None:
 loglevel = 'LOG_%s' % loglevel.upper()
 config.global_set_option('log-threshold', loglevel)
 config.init_log(loglevel, debug=debug, force=True)
-if self.get('profile'):
+if self['profile']:
 config.global_set_option('profile', self.config.profile)
 helper = self.config_helper(config, cmdname='start')
 pidf = config['pid-file']
 if exists(pidf) and not force:
 msg = "%s seems to be running. Remove %s by hand if necessary or use \
 the --force option."
 raise ExecutionError(msg % (appid, pidf))
-helper.start_command(config, debug)
+helper.start_server(config, debug)
-return True
+if not debug:
+# in debug mode, we reach this point once the instance is stopped...
+print 'instance %s %s' % (appid, self.actionverb)
 class StopInstanceCommand(InstanceCommand):
 """Stop the given instances.
 # already removed by twistd
 pass
 print 'instance %s stopped' % appid
-class RestartInstanceCommand(StartInstanceCommand,
+class RestartInstanceCommand(StartInstanceCommand):
-StopInstanceCommand):
 """Restart the given instances.
 <instance>...
 identifiers of the instances to restart. If no instance is
 given, restart them all.
 super(RestartInstanceCommand, self).run_args(args, askconfirm)
 return
 print ('some specific start order is specified, will first stop all '
 'instances then restart them.')
 # get instances in startorder
-stopped = []
 for appid in args:
 if askconfirm:
 print '*'*72
 if not ASK.confirm('%s instance %r ?' % (self.name, appid)):
 continue
-self.stop_instance(appid)
+StopInstanceCommand().stop_instance(appid)
-stopped.append(appid)
 forkcmd = [w for w in sys.argv if not w in args]
 forkcmd[1] = 'start'
 forkcmd = ' '.join(forkcmd)
 for appid in reversed(args):
 status = system('%s %s' % (forkcmd, appid))
 if status:
 sys.exit(status)
 def restart_instance(self, appid):
-self.stop_instance(appid)
+StopInstanceCommand().stop_instance(appid)
-if self.start_instance(appid):
+self.start_instance(appid)
-print 'instance %s %s' % (appid, self.actionverb)
 class ReloadConfigurationCommand(RestartInstanceCommand):
 """Reload the given instances. This command is equivalent to a
 restart for now.
 print "should be running with pid %s but the process can not be found" % pid
 continue
 print "running with pid %s" % (pid)
-class UpgradeInstanceCommand(InstanceCommandFork,
+class UpgradeInstanceCommand(InstanceCommandFork):
-StartInstanceCommand,
-StopInstanceCommand):
 """Upgrade an instance after cubicweb and/or component(s) upgrade.
 For repository update, you will be prompted for a login / password to use
 to connect to the system database.  For some upgrades, the given user
 should have create or alter table permissions.
 repository should connect to for upgrading. When unspecified or 'migration' is \
 given, appropriate sources for migration will be automatically selected \
 (recommended). If 'all' is given, will connect to all defined sources.",
 }),
 )
-def ordered_instances(self):
-# need this since mro return StopInstanceCommand implementation
-return InstanceCommand.ordered_instances(self)
 def upgrade_instance(self, appid):
 print '\n' + underline_title('Upgrading the instance %s' % appid)
 from logilab.common.changelog import Version
 config = cwcfg.config_for(appid)
 return
 for cube, fromversion, toversion in toupgrade:
 print '-> migration needed from %s to %s for %s' % (fromversion, toversion, cube)
 # only stop once we're sure we have something to do
 if not (cwcfg.mode == 'dev' or self.config.nostartstop):
-self.stop_instance(appid)
+StopCommand().stop_instance(appid)
 # run cubicweb/componants migration scripts
 mih.migrate(vcconf, reversed(toupgrade), self.config)
 # rewrite main configuration file
 mih.rewrite_configuration()
 # handle i18n upgrade:
 return
 mih.shutdown()
 print
 print '-> instance migrated.'
 if not (cwcfg.mode == 'dev' or self.config.nostartstop):
-self.start_instance(appid)
+StartCommand().start_instance(appid)
 print
 class ShellCommand(Command):
 """Run an interactive migration shell. This is a python shell with

changeset 3185	bd0126d17e83
parent 3163	edfe43ceaa35
parent 3184	613064b49331
child 3199	fc63b80ec979