finish cleaning with util.report

diff --git a/sfa/server/sfa-clean-peer-records.py b/sfa/server/sfa-clean-peer-records.py
index 5edb3f3..e3d8128 100644 (file)
--- 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 326db38..dfcc1e1 100755 (executable)
--- 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 c0d7d4f..44d0b86 100644 (file)
--- 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 *