[Dev OpenGP] [127] daemon

[subversion@xxxxxxxxxxxxx]

Revision: 127
Author:   nicolaf
Date:     2009-03-27 03:02:14 +0100 (Fri, 27 Mar 2009)

Log Message:
-----------
daemon

Modified Paths:
--------------
    trunk/src/bin/ogpdaemon


Modified: trunk/src/bin/ogpdaemon
===================================================================
--- trunk/src/bin/ogpdaemon	2009-03-27 01:51:57 UTC (rev 126)
+++ trunk/src/bin/ogpdaemon	2009-03-27 02:02:14 UTC (rev 127)
@@ -124,15 +124,16 @@
 		If LDAP SOAs changed since last time, pull conf from LDAP and install it on local machine
 	"""
 	# if SOAS didnt change, do't do anything
-	if not checkSOAs():
+	if not reload and not checkSOAs():
 		logging.info("SOAs didn't change, so skipping configuration installation.")
 		if reload:
 			print "SOAs didn't change, so skipping configuration installation."
 		return
 	else:
-		logging.info("SOAs changed, installing conf...")
 		if reload:
-			print "SOAs changed, installing conf..."
+			logging.info("--reload-conf, so forcing conf installation...")
+		else:
+			logging.info("SOAs changed, installing conf...")
 	
 	requiredPlugins=core.getRequiredPlugins(dn)
 	for pluginName in requiredPlugins:
@@ -194,6 +195,7 @@
 	conf = totalConf
 except:
 	logging.error("OgpDaemon: startup failed with %s" % sys.exc_info()[1])
+	print "OgpDaemon: startup failed with %s" % sys.exc_info()[1]
 	exit(1)
 
 # if running as daemon, fork after initialization