From f17e0c96b72305cb80958022820f405973375358 Mon Sep 17 00:00:00 2001 From: Faiyaz Ahmed Date: Tue, 25 Nov 2008 19:30:43 +0000 Subject: [PATCH] Merge changes that existed in branch concerning slicefamily w/ trunk. Also changed logging in 1.7 branch to be less noisey. Removed support for proper. --- conf_files.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/conf_files.py b/conf_files.py index e6bfae2..fd926a5 100644 --- a/conf_files.py +++ b/conf_files.py @@ -28,15 +28,13 @@ class conf_files: def system(self, cmd): if not self.noscripts and cmd: - logger.log('conf_files: running command %s' % cmd) + logger.verbose('conf_files: running command %s' % cmd) return tools.fork_as(None, os.system, cmd) else: return 0 def update_conf_file(self, cf_rec): if not cf_rec['enabled']: return dest = cf_rec['dest'] - # XXX Remove once old Node Manager is out of service - if dest == '/etc/proper/propd.conf': return err_cmd = cf_rec['error_cmd'] mode = string.atoi(cf_rec['file_permissions'], base=8) try: @@ -63,7 +61,7 @@ class conf_files: else: url += '?' url += "slicefamily=%s"%tools.slicefamily() try: - logger.log("retrieving URL=%s"%url) + logger.verbose("retrieving URL=%s"%url) contents = curlwrapper.retrieve(url, self.config.cacert) except xmlrpclib.ProtocolError,e: logger.log('conf_files: failed to retrieve %s from %s, skipping' % (dest, url)) -- 2.43.0