##// END OF EJS Templates
Beginning to transition all paths, files, dirs over to unicode....
Beginning to transition all paths, files, dirs over to unicode. In preparation for getting ready for Python 3, all filename, paths and dirs should be representated as unicode strings internally. I have begun to make this transition in the main applications (ipython/ipcontroller/ipengine/ipcluster).

File last commit:

r2328:8303a108
r2328:8303a108
Show More
ipcontrollerapp.py
268 lines | 9.9 KiB | text/x-python | PythonLexer
Brian Granger
Continuing work on ipcontroller.
r2288 #!/usr/bin/env python
# encoding: utf-8
"""
Brian Granger
ipcontroller/ipengine use the new clusterdir.py module.
r2301 The IPython controller application.
Brian Granger
Continuing work on ipcontroller.
r2288 """
#-----------------------------------------------------------------------------
# Copyright (C) 2008-2009 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
Brian Granger
Added .pid files to ipcluster and ipcontroller and daemon mode....
r2313 from __future__ import with_statement
Brian Granger
Continuing work on ipcontroller.
r2288 import copy
import os
import sys
from twisted.application import service
Brian Granger
ipcontroller/ipengine use the new clusterdir.py module.
r2301 from twisted.internet import reactor
Brian Granger
Continuing work on ipcontroller.
r2288 from twisted.python import log
from IPython.config.loader import Config, NoConfigDefault
Brian Granger
ipcontroller/ipengine use the new clusterdir.py module.
r2301 from IPython.kernel.clusterdir import (
ApplicationWithClusterDir,
AppWithClusterDirArgParseConfigLoader
Brian Granger
Work on ipcontroller....
r2296 )
Brian Granger
Continuing work on ipcontroller.
r2288 from IPython.core import release
Brian Granger
ipcontroller/ipengine use the new clusterdir.py module.
r2301 from IPython.utils.traitlets import Str, Instance
Brian Granger
Continuing work on ipcontroller.
r2288
from IPython.kernel import controllerservice
from IPython.kernel.fcutil import FCServiceFactory
#-----------------------------------------------------------------------------
Brian Granger
General work on the kernel config.
r2294 # Default interfaces
Brian Granger
Continuing work on ipcontroller.
r2288 #-----------------------------------------------------------------------------
Brian Granger
Finished refactoring ipcontroller to be a proper application....
r2297 # The default client interfaces for FCClientServiceFactory.interfaces
Brian Granger
Continuing work on ipcontroller.
r2288 default_client_interfaces = Config()
default_client_interfaces.Task.interface_chain = [
'IPython.kernel.task.ITaskController',
'IPython.kernel.taskfc.IFCTaskController'
]
Brian Granger
General work on the kernel config.
r2294
Brian Granger
Continuing work on ipcontroller.
r2288 default_client_interfaces.Task.furl_file = 'ipcontroller-tc.furl'
Brian Granger
Finished refactoring ipcontroller to be a proper application....
r2297
Brian Granger
Continuing work on ipcontroller.
r2288 default_client_interfaces.MultiEngine.interface_chain = [
'IPython.kernel.multiengine.IMultiEngine',
'IPython.kernel.multienginefc.IFCSynchronousMultiEngine'
]
Brian Granger
General work on the kernel config.
r2294
Brian Granger
Beginning to transition all paths, files, dirs over to unicode....
r2328 default_client_interfaces.MultiEngine.furl_file = u'ipcontroller-mec.furl'
Brian Granger
Continuing work on ipcontroller.
r2288
# Make this a dict we can pass to Config.__init__ for the default
default_client_interfaces = dict(copy.deepcopy(default_client_interfaces.items()))
Brian Granger
Finished refactoring ipcontroller to be a proper application....
r2297 # The default engine interfaces for FCEngineServiceFactory.interfaces
Brian Granger
Continuing work on ipcontroller.
r2288 default_engine_interfaces = Config()
default_engine_interfaces.Default.interface_chain = [
'IPython.kernel.enginefc.IFCControllerBase'
]
Brian Granger
General work on the kernel config.
r2294
Brian Granger
Beginning to transition all paths, files, dirs over to unicode....
r2328 default_engine_interfaces.Default.furl_file = u'ipcontroller-engine.furl'
Brian Granger
Continuing work on ipcontroller.
r2288
# Make this a dict we can pass to Config.__init__ for the default
default_engine_interfaces = dict(copy.deepcopy(default_engine_interfaces.items()))
Brian Granger
General work on the kernel config.
r2294 #-----------------------------------------------------------------------------
# Service factories
#-----------------------------------------------------------------------------
Brian Granger
Continuing work on ipcontroller.
r2288
class FCClientServiceFactory(FCServiceFactory):
"""A Foolscap implementation of the client services."""
Brian Granger
Beginning to transition all paths, files, dirs over to unicode....
r2328 cert_file = Unicode(u'ipcontroller-client.pem', config=True)
Brian Granger
Finished refactoring ipcontroller to be a proper application....
r2297 interfaces = Instance(klass=Config, kw=default_client_interfaces,
Brian Granger
Continuing work on ipcontroller.
r2288 allow_none=False, config=True)
class FCEngineServiceFactory(FCServiceFactory):
"""A Foolscap implementation of the engine services."""
Brian Granger
Beginning to transition all paths, files, dirs over to unicode....
r2328 cert_file = Unicode(u'ipcontroller-engine.pem', config=True)
Brian Granger
Finished refactoring ipcontroller to be a proper application....
r2297 interfaces = Instance(klass=dict, kw=default_engine_interfaces,
Brian Granger
Continuing work on ipcontroller.
r2288 allow_none=False, config=True)
#-----------------------------------------------------------------------------
# The main application
#-----------------------------------------------------------------------------
cl_args = (
# Client config
(('--client-ip',), dict(
type=str, dest='FCClientServiceFactory.ip', default=NoConfigDefault,
Brian Granger
ipcontroller/ipengine use the new clusterdir.py module.
r2301 help='The IP address or hostname the controller will listen on for '
'client connections.',
Brian Granger
Continuing work on ipcontroller.
r2288 metavar='FCClientServiceFactory.ip')
),
(('--client-port',), dict(
type=int, dest='FCClientServiceFactory.port', default=NoConfigDefault,
Brian Granger
ipcontroller/ipengine use the new clusterdir.py module.
r2301 help='The port the controller will listen on for client connections. '
'The default is to use 0, which will autoselect an open port.',
Brian Granger
Continuing work on ipcontroller.
r2288 metavar='FCClientServiceFactory.port')
),
(('--client-location',), dict(
type=str, dest='FCClientServiceFactory.location', default=NoConfigDefault,
Brian Granger
ipcontroller/ipengine use the new clusterdir.py module.
r2301 help='The hostname or IP that clients should connect to. This does '
'not control which interface the controller listens on. Instead, this '
'determines the hostname/IP that is listed in the FURL, which is how '
'clients know where to connect. Useful if the controller is listening '
'on multiple interfaces.',
Brian Granger
Continuing work on ipcontroller.
r2288 metavar='FCClientServiceFactory.location')
),
# Engine config
(('--engine-ip',), dict(
type=str, dest='FCEngineServiceFactory.ip', default=NoConfigDefault,
Brian Granger
ipcontroller/ipengine use the new clusterdir.py module.
r2301 help='The IP address or hostname the controller will listen on for '
'engine connections.',
Brian Granger
Continuing work on ipcontroller.
r2288 metavar='FCEngineServiceFactory.ip')
),
(('--engine-port',), dict(
type=int, dest='FCEngineServiceFactory.port', default=NoConfigDefault,
Brian Granger
ipcontroller/ipengine use the new clusterdir.py module.
r2301 help='The port the controller will listen on for engine connections. '
'The default is to use 0, which will autoselect an open port.',
Brian Granger
Continuing work on ipcontroller.
r2288 metavar='FCEngineServiceFactory.port')
),
(('--engine-location',), dict(
type=str, dest='FCEngineServiceFactory.location', default=NoConfigDefault,
Brian Granger
ipcontroller/ipengine use the new clusterdir.py module.
r2301 help='The hostname or IP that engines should connect to. This does '
'not control which interface the controller listens on. Instead, this '
'determines the hostname/IP that is listed in the FURL, which is how '
'engines know where to connect. Useful if the controller is listening '
'on multiple interfaces.',
Brian Granger
Continuing work on ipcontroller.
r2288 metavar='FCEngineServiceFactory.location')
),
# Global config
Brian Granger
General work on the kernel config.
r2294 (('--log-to-file',), dict(
action='store_true', dest='Global.log_to_file', default=NoConfigDefault,
help='Log to a file in the log directory (default is stdout)')
Brian Granger
Continuing work on ipcontroller.
r2288 ),
Brian Granger
General work on the kernel config.
r2294 (('-r','--reuse-furls'), dict(
Brian Granger
Continuing work on ipcontroller.
r2288 action='store_true', dest='Global.reuse_furls', default=NoConfigDefault,
Brian Granger
ipcontroller/ipengine use the new clusterdir.py module.
r2301 help='Try to reuse all FURL files. If this is not set all FURL files '
'are deleted before the controller starts. This must be set if '
'specific ports are specified by --engine-port or --client-port.')
Brian Granger
Finished refactoring ipcontroller to be a proper application....
r2297 ),
Brian Granger
More work on the kernel.
r2314 (('--no-secure',), dict(
Brian Granger
Finished refactoring ipcontroller to be a proper application....
r2297 action='store_false', dest='Global.secure', default=NoConfigDefault,
help='Turn off SSL encryption for all connections.')
Brian Granger
More work on the kernel.
r2314 ),
(('--secure',), dict(
action='store_true', dest='Global.secure', default=NoConfigDefault,
help='Turn off SSL encryption for all connections.')
Brian Granger
Work on ipcontroller....
r2296 )
Brian Granger
Continuing work on ipcontroller.
r2288 )
Brian Granger
ipcontroller/ipengine use the new clusterdir.py module.
r2301 class IPControllerAppCLConfigLoader(AppWithClusterDirArgParseConfigLoader):
Brian Granger
Continuing work on ipcontroller.
r2288
arguments = cl_args
Brian Granger
Beginning to transition all paths, files, dirs over to unicode....
r2328 default_config_file_name = u'ipcontroller_config.py'
Brian Granger
Continuing work on ipcontroller.
r2288
Brian Granger
Work on ipcontroller....
r2296
Brian Granger
ipcontroller/ipengine use the new clusterdir.py module.
r2301 class IPControllerApp(ApplicationWithClusterDir):
Brian Granger
Continuing work on ipcontroller.
r2288
Brian Granger
Beginning to transition all paths, files, dirs over to unicode....
r2328 name = u'ipcontroller'
Brian Granger
Work on ipcontroller....
r2296 description = 'Start the IPython controller for parallel computing.'
Brian Granger
Finished refactoring ipcontroller to be a proper application....
r2297 config_file_name = default_config_file_name
Brian Granger
Lots more work on the kernel scripts.
r2303 auto_create_cluster_dir = True
Brian Granger
Continuing work on ipcontroller.
r2288
def create_default_config(self):
super(IPControllerApp, self).create_default_config()
self.default_config.Global.reuse_furls = False
Brian Granger
Finished refactoring ipcontroller to be a proper application....
r2297 self.default_config.Global.secure = True
Brian Granger
Continuing work on ipcontroller.
r2288 self.default_config.Global.import_statements = []
Brian Granger
Most of the new ipcluster is now working, including a nice client.
r2306 self.default_config.Global.clean_logs = True
Brian Granger
General work on the kernel config.
r2294
Brian Granger
Finished refactoring ipcontroller to be a proper application....
r2297 def create_command_line_config(self):
"""Create and return a command line config loader."""
return IPControllerAppCLConfigLoader(
description=self.description,
version=release.version
)
def post_load_command_line_config(self):
# Now setup reuse_furls
Brian Granger
ipcontroller/ipengine use the new clusterdir.py module.
r2301 c = self.command_line_config
if hasattr(c.Global, 'reuse_furls'):
c.FCClientServiceFactory.reuse_furls = c.Global.reuse_furls
c.FCEngineServiceFactory.reuse_furls = c.Global.reuse_furls
del c.Global.reuse_furls
if hasattr(c.Global, 'secure'):
c.FCClientServiceFactory.secure = c.Global.secure
c.FCEngineServiceFactory.secure = c.Global.secure
del c.Global.secure
Brian Granger
Finished refactoring ipcontroller to be a proper application....
r2297
Brian Granger
Continuing work on ipcontroller.
r2288 def construct(self):
# I am a little hesitant to put these into InteractiveShell itself.
# But that might be the place for them
sys.path.insert(0, '')
self.start_logging()
self.import_statements()
Brian Granger
Added .pid files to ipcluster and ipcontroller and daemon mode....
r2313
Brian Granger
Continuing work on ipcontroller.
r2288 # Create the service hierarchy
self.main_service = service.MultiService()
# The controller service
controller_service = controllerservice.ControllerService()
controller_service.setServiceParent(self.main_service)
# The client tub and all its refereceables
csfactory = FCClientServiceFactory(self.master_config, controller_service)
client_service = csfactory.create()
client_service.setServiceParent(self.main_service)
# The engine tub
esfactory = FCEngineServiceFactory(self.master_config, controller_service)
engine_service = esfactory.create()
engine_service.setServiceParent(self.main_service)
def import_statements(self):
statements = self.master_config.Global.import_statements
for s in statements:
try:
Brian Granger
Finished refactoring ipcontroller to be a proper application....
r2297 log.msg("Executing statement: '%s'" % s)
Brian Granger
Continuing work on ipcontroller.
r2288 exec s in globals(), locals()
except:
Brian Granger
Finished refactoring ipcontroller to be a proper application....
r2297 log.msg("Error running statement: %s" % s)
Brian Granger
Continuing work on ipcontroller.
r2288
def start_app(self):
Brian Granger
General work on the controller/engine/cluster startup....
r2323 # Start the controller service.
Brian Granger
Continuing work on ipcontroller.
r2288 self.main_service.startService()
Brian Granger
General work on the controller/engine/cluster startup....
r2323 # Write the .pid file overwriting old ones. This allow multiple
# controllers to clober each other. But Windows is not cleaning
# these up properly.
bgranger
Minors fixes on Windows....
r2318 self.write_pid_file(overwrite=True)
Brian Granger
General work on the controller/engine/cluster startup....
r2323 # cd to the cluster_dir as our working directory.
os.chdir(self.master_config.Global.cluster_dir)
# Add a trigger to delete the .pid file upon shutting down.
Brian Granger
Added .pid files to ipcluster and ipcontroller and daemon mode....
r2313 reactor.addSystemEventTrigger('during','shutdown', self.remove_pid_file)
Brian Granger
Continuing work on ipcontroller.
r2288 reactor.run()
Brian Granger
Work on ipcontroller....
r2296
def launch_new_instance():
"""Create and run the IPython controller"""
Brian Granger
Continuing work on ipcontroller.
r2288 app = IPControllerApp()
app.start()
Brian Granger
Semi-working refactored ipcluster....
r2302
if __name__ == '__main__':
launch_new_instance()