From 788abac8e9ecd977c74b92b7bd16821b3a96c8e6 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 1 Oct 2010 09:10:06 +0200 Subject: [PATCH] finish cleaning with util.report --- sfa/server/sfa-clean-peer-records.py | 1 - sfa/server/sfa-server.py | 5 ++--- sfa/util/table.py | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sfa/server/sfa-clean-peer-records.py b/sfa/server/sfa-clean-peer-records.py index 5edb3f36..e3d81289 100644 --- a/sfa/server/sfa-clean-peer-records.py +++ b/sfa/server/sfa-clean-peer-records.py @@ -10,7 +10,6 @@ from sfa.plc.api import SfaAPI from sfa.util.config import Config from sfa.trust.certificate import Keypair from sfa.trust.hierarchy import Hierarchy -from sfa.util.report import trace, error from sfa.server.registry import Registries import sfa.util.xmlrpcprotocol as xmlrpcprotocol import socket diff --git a/sfa/server/sfa-server.py b/sfa/server/sfa-server.py index 326db386..dfcc1e1b 100755 --- a/sfa/server/sfa-server.py +++ b/sfa/server/sfa-server.py @@ -44,7 +44,6 @@ from sfa.trust.trustedroot import TrustedRootList from sfa.trust.certificate import Keypair, Certificate from sfa.trust.hierarchy import Hierarchy from sfa.util.config import Config -from sfa.util.report import trace from sfa.plc.api import SfaAPI from sfa.server.registry import Registries from sfa.server.aggregate import Aggregates @@ -85,8 +84,8 @@ def init_server_key(server_key_file, server_cert_file, config, hierarchy): if not os.path.exists(key_file): # if it doesnt exist then this is probably a fresh interface # with no records. Generate a random keypair for now - trace("server's public key not found in %s" % key_file) - trace("generating a random server key pair") + sfa_logger.debug("server's public key not found in %s" % key_file) + sfa_logger.debug("generating a random server key pair") key = Keypair(create=True) key.save_to_file(server_key_file) cert = Certificate(subject=subject) diff --git a/sfa/util/table.py b/sfa/util/table.py index c0d7d4f4..44d0b869 100644 --- a/sfa/util/table.py +++ b/sfa/util/table.py @@ -5,7 +5,6 @@ # # TODO: Use existing PLC database methods? or keep this separate? -import report import pgdb from sfa.util.PostgreSQL import * -- 2.43.0