diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2006-09-11 03:36:59 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2006-09-11 03:36:59 +0000 |
| commit | 136a23aafedc7755e91de56fda6edac9be05cefe (patch) | |
| tree | 97d126dd0290a554ff7fabaeabaaa2d0fd3a9ae7 | |
| parent | 93f7b049fab7877fe2ec33db6820d61803f0efad (diff) | |
| download | bcfg2-136a23aafedc7755e91de56fda6edac9be05cefe.tar.gz bcfg2-136a23aafedc7755e91de56fda6edac9be05cefe.tar.bz2 bcfg2-136a23aafedc7755e91de56fda6edac9be05cefe.zip | |
Make RecvStats use the same alias/address lookup logic as the rest of the server
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2237 ce84e21b-d406-0410-9b95-82705330c041
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-server | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules index 9a77139eb..d3a344100 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ # DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean # Comment this line if you wish to build without pycentral or pysupport -DEB_PYTHON_SYSTEM := pycentral +#DEB_PYTHON_SYSTEM := pycentral DEB_PYTHON_MODULE_PACKAGE := bcfg2 ifdef DEB_PYTHON_SYSTEM DEB_DH_INSTALLINIT_ARGS := -n diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index 506bfeb84..8e845a7d4 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -182,9 +182,10 @@ class Bcfg2Serv(Bcfg2.Server.Component.Component): # Versioned stats to prevent tied client/server upgrade if state.get('version') >= '2.0': client = self.Core.metadata.resolve_client(address[0]) + meta = self.Core.metadata.get_metadata(client) # Update statistics - self.Core.stats.updateStats(sdata, client) + self.Core.stats.updateStats(sdata, meta.hostname) self.logger.info("Client %s reported state %s" % (client, state.attrib['state'])) |