Changeset 540

Timestamp:

05/11/2008 10:01:42 PM (2 months ago)

Author:

athomas

Message:

• Work around some problems with startup ordering. There has to be a better way to
  do this, but it works for now.
  

Files:

• ape/trunk/ape/commandline.py (modified) (1 diff)
• ape/trunk/ape/engine.py (modified) (4 diffs)

ape/trunk/ape/commandline.py

@@ -159 +159 @@
-    options, args = parser.parse_args(args)
-
+    wrapped = cls.trigger_startup_listeners
+    def wrapper(self):
+        for name, option in ape.Option.registry.iteritems():
+            optparse_option = _to_optparse_option(app.config, option)
+            parser.add_option(optparse_option)
+
+        options, args = parser.parse_args(argv[1:])
+        return wrapped(self)
+    cls.trigger_startup_listeners = wrapper
+
-    app = cls(
-application_name=name, config_file=options.config
+config_file=options.config, application_name=name
-        logging_uri=options.logging, debug=options.debug, **kwargs
-        )
-
-    for name, option in ape.Option.registry.iteritems():
-        optparse_option = _to_optparse_option(app.config, option)
-        parser.add_option(optparse_option)
-
-    options, args = parser.parse_args(argv[1:])
-    if not defer_startup:
-        app.startup()

ape/trunk/ape/engine.py

@@ -58 +58 @@
-
-    # Class defaults
+    entry_point_name = None
-    application_name = None
-    config_file = None
@@ -63 +64 @@
-    _active_engine = None
-
-application_name=None, config_fil
+config_file=None, application_nam
-                 defer_startup=False, logging_uri=None, debug=None):
-        """Construct a new Engine.
@@ -97 +98 @@
-        self.log.debug('APE: Starting %s', self.application_name)
-        self.load_plugins(plugin_paths=self.plugin_paths)
+        self.trigger_startup_listeners()
+        Engine._active_engine = self
+
+    def trigger_startup_listeners(self):
+        """Call startup listeners.
+
+        Mostly useful for hooking into startup process.
+        """
-        for listener in self.lifecycle_listeners:
-            listener.engine_startup()
-        Engine._active_engine = self
-
-    def shutdown(self):
@@ -116 +124 @@
-        """Load all Agate plugins registered through setuptools."""
-        if entry_point_name is None:
-application_name + '.plugins'
+entry_point_name
-        if plugin_paths is None:
-[]
+self.plugin_paths
-
-        distributions, errors = pkg_resources.working_set.find_plugins(