diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2006-04-26 18:58:34 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2006-04-26 18:58:34 +0000 |
| commit | 2a6bf7a1d58ea1fbe9af90b324e8142b0e5c8662 (patch) | |
| tree | f8f791e9b37fb647335e6bc7156fbde7b8e9a0fe | |
| parent | 18200fc366a26e77ab50505abf3020b23e95bfe8 (diff) | |
| download | bcfg2-2a6bf7a1d58ea1fbe9af90b324e8142b0e5c8662.tar.gz bcfg2-2a6bf7a1d58ea1fbe9af90b324e8142b0e5c8662.tar.bz2 bcfg2-2a6bf7a1d58ea1fbe9af90b324e8142b0e5c8662.zip | |
Roll up minor patches changing logging and the init script
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1853 ce84e21b-d406-0410-9b95-82705330c041
| -rw-r--r-- | debian/bcfg2.init | 2 | ||||
| -rw-r--r-- | src/lib/Client/Proxy.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/bcfg2.init b/debian/bcfg2.init index 14c80d75a..84bc90abe 100644 --- a/debian/bcfg2.init +++ b/debian/bcfg2.init @@ -6,7 +6,7 @@ # description: bcfg2 client for configuration requests # BCFG2_OPTIONS="-nq" -test -f "/etc/default/bcfg2" ] && . /etc/default/bcfg2 +test -f "/etc/default/bcfg2" && . /etc/default/bcfg2 case "$1" in start) diff --git a/src/lib/Client/Proxy.py b/src/lib/Client/Proxy.py index 8ea28cc9c..9d96fd936 100644 --- a/src/lib/Client/Proxy.py +++ b/src/lib/Client/Proxy.py @@ -57,7 +57,7 @@ class SafeProxy: self.log.debug("Operation %s completed with fault" % (methodName)) raise except socket.sslerror: - self.log.error("Attempt %d of %d failed due to SSL negotiation failure" % + self.log.debug("Attempt %d of %d failed due to SSL negotiation failure" % ((irs + 1), self._retries)) except socket.error, serr: self.log.debug("Attempting %s (%d of %d) failed because %s" % (methodName, (irs+1), |