X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fsfa-start.py;h=5b386c0209c2dfc247ed27167a4b7205bc4cb2a7;hb=fd395e1944dcd49f10a4d5b27ce4983ad389fb96;hp=235e4bbf08f1d3358a60b0a8315e9a6cb1b36b8d;hpb=144f7eea9d99b4fcb8748ba27e108afeed1108fe;p=sfa.git diff --git a/sfa/server/sfa-start.py b/sfa/server/sfa-start.py index 235e4bbf..5b386c02 100755 --- a/sfa/server/sfa-start.py +++ b/sfa/server/sfa-start.py @@ -33,17 +33,20 @@ 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.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.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 - api.logger.info(message) + logger.info(message) 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) @@ -197,6 +200,7 @@ def main(): (options, args) = parser.parse_args() config = Config() + init_logger('server') logger.setLevelFromOptVerbose(config.SFA_API_LOGLEVEL) # ge the server's key and cert