From d61fbd1be2c1012050a4e2f56206a03e2e389332 Mon Sep 17 00:00:00 2001
From: Tony Mack <tmack@cs.princeton.edu>
Date: Fri, 7 May 2010 21:27:47 +0000
Subject: [PATCH] message should get logged and reset at every iteration of the
loop
---
sfa/server/interface.py | 11 ++++++-----
sfa/server/sfa-server.py | 8 ++++----
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/sfa/server/interface.py b/sfa/server/interface.py
index 9e7dc5a1..8e5822e9 100644
--- a/sfa/server/interface.py
+++ b/sfa/server/interface.py
@@ -102,13 +102,14 @@ class Interfaces(dict):
interface_info = self.interfaces[new_hrn]
interface = self.get_connections(self.interfaces[new_hrn])[new_hrn]
trusted_gids = interface.get_trusted_certs()
- # default message
- message = "interface: %s\tunable to install trusted gid for %s" % \
- (self.api.interface, new_hrn)
if trusted_gids:
# the gid we want shoudl be the first one in the list,
# but lets make sure
for trusted_gid in trusted_gids:
+ # default message
+ message = "interface: %s\t" % (self.api.interface)
+ message += "unable to install trusted gid for %s" % \
+ (new_hrn)
gid = GID(string=trusted_gids[0])
peer_gids.append(gid)
if gid.get_hrn() == new_hrn:
@@ -116,8 +117,8 @@ class Interfaces(dict):
gid.save_to_file(gid_filename, save_parents=True)
message = "interface: %s\tinstalled trusted gid for %s" % \
(self.api.interface, new_hrn)
- # log the message
- self.api.logger.info(message)
+ # log the message
+ self.api.logger.info(message)
except:
message = "interface: %s\tunable to install trusted gid for %s" % \
(self.api.interface, new_hrn)
diff --git a/sfa/server/sfa-server.py b/sfa/server/sfa-server.py
index 58bfdb9c..5e0905f0 100755
--- a/sfa/server/sfa-server.py
+++ b/sfa/server/sfa-server.py
@@ -150,12 +150,12 @@ def init_server(options, config):
manager.init_server()
-def sync_interfaces():
+def sync_interfaces(server_key_file, server_cert_file):
"""
Attempt to install missing trusted gids and db records for
our federated interfaces
"""
- api = SfaAPI()
+ api = SfaAPI(key_file = server_key_file, cert_file = server_cert_file)
registries = Registries(api)
aggregates = Aggregates(api)
registries.sync_interfaces()
@@ -185,7 +185,6 @@ def main():
help="Run as daemon.", default=False)
(options, args) = parser.parse_args()
- if (options.daemon): daemon()
config = Config()
hierarchy = Hierarchy()
@@ -194,8 +193,9 @@ def main():
init_server_key(server_key_file, server_cert_file, config, hierarchy)
init_server(options, config)
- sync_interfaces()
+ sync_interfaces(server_key_file, server_cert_file)
+ if (options.daemon): daemon()
# start registry server
if (options.registry):
from sfa.server.registry import Registry
--
2.47.0