milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change static discovery init from env

pull/232/head
peng.xu 2019-10-28 10:29:21 +08:00
parent 8630077e8a
commit 9f52316704
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shards/discovery/plugins/static_provider.py
View File

@ -5,8 +5,10 @@ if __name__ == '__main__':
import logging
import socket
from environs import Env
logger = logging.getLogger(__name__)
env = Env()
class StaticDiscovery(object):
@ -14,9 +16,9 @@ class StaticDiscovery(object):
def __init__(self, config, conn_mgr, **kwargs):
self.conn_mgr = conn_mgr
hosts = [config.DISCOVERY_STATIC_HOSTS] if isinstance(config.DISCOVERY_STATIC_HOSTS, str) else hosts
hosts = env.list('DISCOVERY_STATIC_HOSTS', [])
self.port = env.int('DISCOVERY_STATIC_PORT', 19530)
self.hosts = [socket.gethostbyname(host) for host in hosts]
self.port = config.DISCOVERY_STATIC_PORT
def start(self):
for host in self.hosts:

7
shards/mishards/settings.py
View File

@ -29,11 +29,6 @@ SERVER_PORT = env.int('SERVER_PORT', 19530)
SERVER_TEST_PORT = env.int('SERVER_TEST_PORT', 19530)
WOSERVER = env.str('WOSERVER')
DISCOVERY_STATIC_HOSTS = env.list('DISCOVERY_STATIC_HOSTS', [])
DISCOVERY_STATIC_PORT = env.int('DISCOVERY_STATIC_PORT', 19530)
# TESTING_WOSERVER = env.str('TESTING_WOSERVER', 'tcp://127.0.0.1:19530')
class TracingConfig:
TRACING_SERVICE_NAME = env.str('TRACING_SERVICE_NAME', 'mishards')
@ -72,7 +67,7 @@ class DefaultConfig:
class TestingConfig(DefaultConfig):
SQLALCHEMY_DATABASE_URI = env.str('SQLALCHEMY_DATABASE_TEST_URI', '')
SQL_ECHO = env.bool('SQL_TEST_ECHO', False)
TRACING_TYPE = env.str('TRACING_TEST_TYPE', '')
TRACER_CLASS_NAME = env.str('TRACER_CLASS_TEST_NAME', '')
ROUTER_CLASS_NAME = env.str('ROUTER_CLASS_TEST_NAME', 'FileBasedHashRingRouter')