From 349584bfab7b0357744080f8aa5e7afe22c93de7 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Tue, 15 Dec 2009 18:03:32 +0000 Subject: [PATCH] dont import some modules into global scope --- sfa/server/sfa-server.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sfa/server/sfa-server.py b/sfa/server/sfa-server.py index e323f2a0..ec0532b3 100755 --- a/sfa/server/sfa-server.py +++ b/sfa/server/sfa-server.py @@ -38,14 +38,8 @@ component_port=12346 import os, os.path import sys from optparse import OptionParser - from sfa.trust.trustedroot import TrustedRootList from sfa.trust.certificate import Keypair, Certificate - -from sfa.server.registry import Registry -from sfa.server.aggregate import Aggregate -from sfa.server.slicemgr import SliceMgr -from sfa.server.component import Component from sfa.trust.hierarchy import Hierarchy from sfa.util.config import Config from sfa.util.report import trace @@ -154,20 +148,24 @@ def main(): # start registry server if (options.registry): + from sfa.server.registry import Registry r = Registry("", registry_port, server_key_file, server_cert_file) r.start() # start aggregate manager if (options.am): + from sfa.server.aggregate import Aggregate a = Aggregate("", aggregate_port, server_key_file, server_cert_file) a.start() # start slice manager if (options.sm): + from sfa.server.slicemgr import SliceMgr s = SliceMgr("", slicemgr_port, server_key_file, server_cert_file) s.start() if (options.cm): + from sfa.server.component import Component c = Component("", component_port, server_key_file, server_cert_file) c.start() -- 2.43.0