diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2006-02-15 16:05:01 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2006-02-15 16:05:01 +0000 |
| commit | 7f0d1e2346eaa62ec10245cf66dff4eb62eb0100 (patch) | |
| tree | 0c82c3b34b835dc6f154fea7587145fc7478c21a /src/lib | |
| parent | 1d6ea8076ba7906b8131ceb9b5ca2ac56222baee (diff) | |
| download | bcfg2-7f0d1e2346eaa62ec10245cf66dff4eb62eb0100.tar.gz bcfg2-7f0d1e2346eaa62ec10245cf66dff4eb62eb0100.tar.bz2 bcfg2-7f0d1e2346eaa62ec10245cf66dff4eb62eb0100.zip | |
fix imports
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1739 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Server/Component.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/Server/Component.py b/src/lib/Server/Component.py index 91b9d6a58..3d1ffd1e7 100644 --- a/src/lib/Server/Component.py +++ b/src/lib/Server/Component.py @@ -2,7 +2,9 @@ __revision__ = '$Revision$' import atexit, logging, select, signal, socket, sys, time, urlparse, xmlrpclib, cPickle, ConfigParser -import BaseHTTPServer, Cobalt.Proxy, OpenSSL.SSL, SimpleXMLRPCServer, SocketServer +import BaseHTTPServer, OpenSSL.SSL, SimpleXMLRPCServer, SocketServer + +import Bcfg2.Client.Proxy as Proxy log = logging.getLogger('Component') @@ -201,7 +203,7 @@ class Component(SSLServer, if self.__name__ == 'service-location' or self.static: return if (time.time() - self.atime) > 240: - slp = Cobalt.Proxy.service_location() + slp = Proxy.service_location() slp.AssertService({'tag':'location', 'name':self.__name__, 'url':self.url}) self.atime = time.time() @@ -209,7 +211,7 @@ class Component(SSLServer, '''remove registration from slp''' if self.__name__ == 'service-location' or self.static: return - slp = Cobalt.Proxy.service_location() + slp = Proxy.service_location() try: slp.DeassertService([{'tag':'location', 'name':self.__name__, 'url':self.url}]) except xmlrpclib.Fault, fault: |