rough cleanup of the slicemanager business

[sfa.git] / sfa / server / sfa-start.py

diff --git a/sfa/server/sfa-start.py b/sfa/server/sfa-start.py
index 7ca1af5..bd41285 100755 (executable)
--- a/sfa/server/sfa-start.py
+++ b/sfa/server/sfa-start.py
@@ -33,17 +33,20 @@ import traceback
 import sys
 from optparse import OptionParser
 
 import sys
 from optparse import OptionParser
 

-from sfa.util.sfalogging import logger
+from sfa.util.sfalogging import init_logger, logger

 from sfa.util.xrn import get_authority, hrn_to_urn
 from sfa.util.config import Config
 from sfa.util.xrn import get_authority, hrn_to_urn
 from sfa.util.config import Config

+

 from sfa.trust.gid import GID
 from sfa.trust.trustedroots import TrustedRoots
 from sfa.trust.certificate import Keypair, Certificate
 from sfa.trust.hierarchy import Hierarchy
 from sfa.trust.gid import GID
 from sfa.trust.gid import GID
 from sfa.trust.trustedroots import TrustedRoots
 from sfa.trust.certificate import Keypair, Certificate
 from sfa.trust.hierarchy import Hierarchy
 from sfa.trust.gid import GID

+

 from sfa.server.sfaapi import SfaApi
 from sfa.server.registry import Registries
 from sfa.server.aggregate import Aggregates
 from sfa.server.sfaapi import SfaApi
 from sfa.server.registry import Registries
 from sfa.server.aggregate import Aggregates

+

 from sfa.client.return_value import ReturnValue
 
 
 from sfa.client.return_value import ReturnValue
 
 


@@ -130,11 +133,11 @@ def install_peer_certs(server_key_file, server_cert_file):
                         gid.save_to_file(gid_filename, save_parents=True)
                         message = "installed trusted cert for %s" % new_hrn
                     # log the message
                         gid.save_to_file(gid_filename, save_parents=True)
                         message = "installed trusted cert for %s" % new_hrn
                     # log the message

-                    api.logger.info(message)
+                    logger.info(message)

         except Exception:
             message = "interface: %s\tunable to install trusted gid for %s" % \
                 (api.interface, new_hrn)
         except Exception:
             message = "interface: %s\tunable to install trusted gid for %s" % \
                 (api.interface, new_hrn)

-            api.logger.log_exc(message)
+            logger.log_exc(message)

     # doesnt matter witch one
     update_cert_records(peer_gids)
 
     # doesnt matter witch one
     update_cert_records(peer_gids)
 


@@ -183,8 +186,6 @@ def main():
     parser = OptionParser(usage="sfa-start.py [options]")
     parser.add_option("-r", "--registry", dest="registry", action="store_true",
                       help="run registry server", default=False)
     parser = OptionParser(usage="sfa-start.py [options]")
     parser.add_option("-r", "--registry", dest="registry", action="store_true",
                       help="run registry server", default=False)

-    parser.add_option("-s", "--slicemgr", dest="sm", action="store_true",
-                      help="run slice manager", default=False)

     parser.add_option("-a", "--aggregate", dest="am", action="store_true",
                       help="run aggregate manager", default=False)
     parser.add_option("-c", "--component", dest="cm", action="store_true",
     parser.add_option("-a", "--aggregate", dest="am", action="store_true",
                       help="run aggregate manager", default=False)
     parser.add_option("-c", "--component", dest="cm", action="store_true",


@@ -197,6 +198,7 @@ def main():
     (options, args) = parser.parse_args()
 
     config = Config()
     (options, args) = parser.parse_args()
 
     config = Config()

+    init_logger('server')

     logger.setLevelFromOptVerbose(config.SFA_API_LOGLEVEL)
 
     # ge the server's key and cert
     logger.setLevelFromOptVerbose(config.SFA_API_LOGLEVEL)
 
     # ge the server's key and cert


@@ -227,12 +229,6 @@ def main():
                       server_key_file, server_cert_file)
         a.start()
 
                       server_key_file, server_cert_file)
         a.start()
 

-    # start slice manager
-    if (options.sm):
-        from sfa.server.slicemgr import SliceMgr
-        s = SliceMgr("", config.SFA_SM_PORT, server_key_file, server_cert_file)
-        s.start()
-

     if (options.cm):
         from sfa.server.component import Component
         c = Component("", config.component_port,
     if (options.cm):
         from sfa.server.component import Component
         c = Component("", config.component_port,


@@ -243,5 +239,6 @@ def main():
 if __name__ == "__main__":
     try:
         main()
 if __name__ == "__main__":
     try:
         main()

-    except:
-        logger.log_exc_critical("SFA server is exiting")
+    except Exception:
+        logger.log_exc("SFA server is exiting")
+        exit(1)