python3 - 2to3 + miscell obvious tweaks

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

diff --git a/sfa/server/sfa-start.py b/sfa/server/sfa-start.py
index 0b999d9..5c3a2e4 100755 (executable)
--- a/sfa/server/sfa-start.py
+++ b/sfa/server/sfa-start.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3

 #
 # PlanetLab SFA implementation
 #
 #
 # PlanetLab SFA implementation
 #


@@ -25,57 +25,42 @@
 # TODO: Can all three servers use the same "registry" certificate?
 ##
 
 # TODO: Can all three servers use the same "registry" certificate?
 ##
 

-### xxx todo not in the config yet
-component_port=12346
-import os, os.path
+import os
+import os.path

 import traceback
 import sys
 from optparse import OptionParser
 
 import traceback
 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

 
 

-# after http://www.erlenstar.demon.co.uk/unix/faq_2.html
-def daemon():
-    """Daemonize the current process."""
-    if os.fork() != 0: os._exit(0)
-    os.setsid()
-    if os.fork() != 0: os._exit(0)
-    os.umask(0)
-    devnull = os.open(os.devnull, os.O_RDWR)
-    os.dup2(devnull, 0)
-    # xxx fixme - this is just to make sure that nothing gets stupidly lost - should use devnull
-    logdir='/var/log/httpd'
-    # when installed in standalone we might not have httpd installed
-    if not os.path.isdir(logdir): os.mkdir('/var/log/httpd')
-    crashlog = os.open('%s/sfa_access_log'%logdir, os.O_RDWR | os.O_APPEND | os.O_CREAT, 0644)
-    os.dup2(crashlog, 1)
-    os.dup2(crashlog, 2)
+from sfa.client.return_value import ReturnValue

 
 
 def install_peer_certs(server_key_file, server_cert_file):
     """
 
 
 def install_peer_certs(server_key_file, server_cert_file):
     """

-    Attempt to install missing trusted gids and db records for 
+    Attempt to install missing trusted gids and db records for

     our federated interfaces
     """
     # Attempt to get any missing peer gids
     # There should be a gid file in /etc/sfa/trusted_roots for every
     # peer registry found in in the registries.xml config file. If there
     # are any missing gids, request a new one from the peer registry.
     our federated interfaces
     """
     # Attempt to get any missing peer gids
     # There should be a gid file in /etc/sfa/trusted_roots for every
     # peer registry found in in the registries.xml config file. If there
     # are any missing gids, request a new one from the peer registry.

-    api = SfaApi(key_file = server_key_file, cert_file = server_cert_file)
+    api = SfaApi(key_file=server_key_file, cert_file=server_cert_file)

     registries = Registries()
     aggregates = Aggregates()
     registries = Registries()
     aggregates = Aggregates()

-    interfaces = dict(registries.items() + aggregates.items())
+    interfaces = dict(list(registries.items()) + list(aggregates.items()))

     gids_current = api.auth.trusted_cert_list
     hrns_current = [gid.get_hrn() for gid in gids_current]
     hrns_expected = set([hrn for hrn in interfaces])
     gids_current = api.auth.trusted_cert_list
     hrns_current = [gid.get_hrn() for gid in gids_current]
     hrns_expected = set([hrn for hrn in interfaces])


@@ -83,21 +68,27 @@ def install_peer_certs(server_key_file, server_cert_file):
     #gids = self.get_peer_gids(new_hrns) + gids_current
     peer_gids = []
     if not new_hrns:
     #gids = self.get_peer_gids(new_hrns) + gids_current
     peer_gids = []
     if not new_hrns:

-        return 
+        return
+

     trusted_certs_dir = api.config.get_trustedroots_dir()
     trusted_certs_dir = api.config.get_trustedroots_dir()

-    for new_hrn in new_hrns: 
-        if not new_hrn: continue
+    for new_hrn in new_hrns:
+        if not new_hrn:
+            continue

         # the gid for this interface should already be installed
         # the gid for this interface should already be installed

-        if new_hrn == api.config.SFA_INTERFACE_HRN: continue
+        if new_hrn == api.config.SFA_INTERFACE_HRN:
+            continue

         try:
             # get gid from the registry
             url = interfaces[new_hrn].get_url()
         try:
             # get gid from the registry
             url = interfaces[new_hrn].get_url()

-            interface = interfaces[new_hrn].server_proxy(server_key_file, server_cert_file, timeout=30)
+            interface = interfaces[new_hrn].server_proxy(
+                server_key_file, server_cert_file, timeout=30)

             # skip non sfa aggregates
             server_version = api.get_cached_server_version(interface)
             if 'sfa' not in server_version:
             # skip non sfa aggregates
             server_version = api.get_cached_server_version(interface)
             if 'sfa' not in server_version:

-                logger.info("get_trusted_certs: skipping non sfa aggregate: %s" % new_hrn)
+                logger.info(
+                    "get_trusted_certs: skipping non sfa aggregate: %s" % new_hrn)

                 continue
                 continue

+

             trusted_gids = ReturnValue.get_value(interface.get_trusted_certs())
             if trusted_gids:
                 # the gid we want should be the first one in the list,
             trusted_gids = ReturnValue.get_value(interface.get_trusted_certs())
             if trusted_gids:
                 # the gid we want should be the first one in the list,


@@ -110,26 +101,29 @@ def install_peer_certs(server_key_file, server_cert_file):
                     gid = GID(string=trusted_gid)
                     peer_gids.append(gid)
                     if gid.get_hrn() == new_hrn:
                     gid = GID(string=trusted_gid)
                     peer_gids.append(gid)
                     if gid.get_hrn() == new_hrn:

-                        gid_filename = os.path.join(trusted_certs_dir, '%s.gid' % new_hrn)
+                        gid_filename = os.path.join(
+                            trusted_certs_dir, '%s.gid' % new_hrn)

                         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)
-        except:
+                    logger.info(message)
+        except Exception:

             message = "interface: %s\tunable to install trusted gid for %s" % \
             message = "interface: %s\tunable to install trusted gid for %s" % \

-                        (api.interface, new_hrn)
-            api.logger.log_exc(message)
+                (api.interface, new_hrn)
+            logger.log_exc(message)

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

+

 def update_cert_records(gids):
     """
 def update_cert_records(gids):
     """

-    Make sure there is a record in the registry for the specified gids. 
+    Make sure there is a record in the registry for the specified gids.

     Removes old records from the db.
     """
     # import db stuff here here so this module can be loaded by PlcComponentApi
     Removes old records from the db.
     """
     # import db stuff here here so this module can be loaded by PlcComponentApi

-    from sfa.storage.alchemy import dbsession
+    from sfa.storage.alchemy import global_dbsession

     from sfa.storage.model import RegRecord
     from sfa.storage.model import RegRecord

+    dbsession = global_dbsession

     if not gids:
         return
     # get records that actually exist in the db
     if not gids:
         return
     # get records that actually exist in the db


@@ -141,81 +135,70 @@ def update_cert_records(gids):
     # remove old records
     for record in records_found:
         if record.hrn not in hrns_expected and \
     # remove old records
     for record in records_found:
         if record.hrn not in hrns_expected and \

-            record.hrn != self.api.config.SFA_INTERFACE_HRN:
+                record.hrn != self.api.config.SFA_INTERFACE_HRN:

             dbsession.delete(record)
 
             dbsession.delete(record)
 

-    # TODO: store urn in the db so we do this in 1 query 
+    # TODO: store urn in the db so we do this in 1 query

     for gid in gids:
         hrn, type = gid.get_hrn(), gid.get_type()
     for gid in gids:
         hrn, type = gid.get_hrn(), gid.get_type()

-        record = dbsession.query(RegRecord).filter_by(hrn=hrn, type=type,pointer=-1).first()
+        record = dbsession.query(RegRecord).filter_by(
+            hrn=hrn, type=type, pointer=-1).first()

         if not record:
         if not record:

-            record = RegRecord (dict= {'type':type,
-                                       'hrn': hrn, 
-                                       'authority': get_authority(hrn),
-                                       'gid': gid.save_to_string(save_parents=True),
-                                       })
+            record = RegRecord(
+                dict={'type': type,
+                      'hrn': hrn,
+                      'authority': get_authority(hrn),
+                      'gid': gid.save_to_string(save_parents=True),
+                      })

             dbsession.add(record)
     dbsession.commit()
             dbsession.add(record)
     dbsession.commit()

-        
+
+

 def main():
     # Generate command line parser
     parser = OptionParser(usage="sfa-start.py [options]")
     parser.add_option("-r", "--registry", dest="registry", action="store_true",
 def main():
     # Generate command line parser
     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)
+                      help="run registry server", default=False)

     parser.add_option("-a", "--aggregate", dest="am", 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",
-         help="run component server", default=False)
-    parser.add_option("-t", "--trusted-certs", dest="trusted_certs", action="store_true",
-         help="refresh trusted certs", default=False)
-    parser.add_option("-d", "--daemon", dest="daemon", action="store_true",
-         help="Run as daemon.", default=False)
+                      help="run aggregate manager", default=False)
+    parser.add_option("-t", "--trusted-certs",
+                      dest="trusted_certs", action="store_true",
+                      help="refresh trusted certs", default=False)

     (options, args) = parser.parse_args()
     (options, args) = parser.parse_args()

-    
+

     config = Config()
     config = Config()

+    init_logger('server')

     logger.setLevelFromOptVerbose(config.SFA_API_LOGLEVEL)
     logger.setLevelFromOptVerbose(config.SFA_API_LOGLEVEL)

-    

 
     # ge the server's key and cert
     hierarchy = Hierarchy()
     auth_info = hierarchy.get_interface_auth_info()
     server_key_file = auth_info.get_privkey_filename()
 
     # ge the server's key and cert
     hierarchy = Hierarchy()
     auth_info = hierarchy.get_interface_auth_info()
     server_key_file = auth_info.get_privkey_filename()

-    server_cert_file = auth_info.get_gid_filename() 
+    server_cert_file = auth_info.get_gid_filename()
+

     # ensure interface cert is present in trusted roots dir
     trusted_roots = TrustedRoots(config.get_trustedroots_dir())
     trusted_roots.add_gid(GID(filename=server_cert_file))
     # ensure interface cert is present in trusted roots dir
     trusted_roots = TrustedRoots(config.get_trustedroots_dir())
     trusted_roots.add_gid(GID(filename=server_cert_file))

-    if (options.daemon):  daemon()
-    
+

     if options.trusted_certs:
     if options.trusted_certs:

-        install_peer_certs(server_key_file, server_cert_file)   
-    
+        install_peer_certs(server_key_file, server_cert_file)
+

     # start registry server
     if (options.registry):
         from sfa.server.registry import Registry
     # start registry server
     if (options.registry):
         from sfa.server.registry import Registry

-        r = Registry("", config.SFA_REGISTRY_PORT, server_key_file, server_cert_file)
+        r = Registry("", config.SFA_REGISTRY_PORT,
+                     server_key_file, server_cert_file)

         r.start()
 
     if (options.am):
         from sfa.server.aggregate import Aggregate
         r.start()
 
     if (options.am):
         from sfa.server.aggregate import Aggregate

-        a = Aggregate("", config.SFA_AGGREGATE_PORT, server_key_file, server_cert_file)
+        a = Aggregate("", config.SFA_AGGREGATE_PORT,
+                      server_key_file, server_cert_file)

         a.start()
 
         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, server_key_file, server_cert_file)
-#        c = Component("", config.SFA_COMPONENT_PORT, server_key_file, server_cert_file)
-        c.start()
-

 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)