Author: tmckay Date: 2011-08-15 19:02:32 +0000 (Mon, 15 Aug 2011) New Revision: 4930
Modified: trunk/sage/python/sage/aviary/aviaryoperations.py Log: Replace localhost in aviary server config strings with result of socket.gethostname()
Modified: trunk/sage/python/sage/aviary/aviaryoperations.py =================================================================== --- trunk/sage/python/sage/aviary/aviaryoperations.py 2011-08-15 18:48:01 UTC (rev 4929) +++ trunk/sage/python/sage/aviary/aviaryoperations.py 2011-08-15 19:02:32 UTC (rev 4930) @@ -1,13 +1,16 @@ import os - -from suds import * -from suds.client import Client -from sage.util import CallSync, CallThread, ObjectPool, host_list import threading import logging import random import urllib2 +import socket +import string
+from suds import * +from suds.client import Client +from sage.util import CallSync, CallThread, ObjectPool, host_list + + log = logging.getLogger("sage.aviary")
#f = open("./suds.client.log", 'a+') @@ -60,13 +63,18 @@
# job_servers and query_servers are comma separated lists of # network locations. See comments on host_port_list for format. + # Replace any occurrence of locahost with output of gethostname() + # before parsing to match Machine fields of QMF objects later on. + host = socket.gethostname() + job_servers = string.replace(job_servers, "localhost", host) + query_servers = string.replace(query_servers, "localhost", host) + self.job_servers = host_list(job_servers, default_scheme = "http", default_port="9090", default_path="/services/job/")
- - self.query_servers = host_list(job_servers, + self.query_servers = host_list(query_servers, default_scheme = "http", default_port="9091", default_path="/services/query/")
cumin-developers@lists.fedorahosted.org