Skip to content

Commit

Permalink
Remove depenence on server-local parser for grpc port. Completely uti…
Browse files Browse the repository at this point in the history
…lize existing settings framework from tabpy server
  • Loading branch information
antesaj committed Mar 24, 2023
1 parent 4564468 commit 96e529b
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions tabpy/tabpy_server/app/arrow_server.py
Expand Up @@ -143,8 +143,6 @@ def _parse_args():
parser = argparse.ArgumentParser()
parser.add_argument("--host", type=str, default="localhost",
help="Address or hostname to listen on")
parser.add_argument("--port", type=int, default=13622,
help="Port number to listen on")
parser.add_argument("--tls", nargs=2, default=None,
metavar=('CERTFILE', 'KEYFILE'),
help="Enable transport-level security")
Expand All @@ -163,21 +161,16 @@ def _get_tls_certificates(args):
tls_certificates.append((tls_cert_chain, tls_private_key))
return tls_certificates

def start(config=None):
# TODO: Determine order of precedence for config vs args vs env vars vs defaults
def start(config):
args = _parse_args()

grpc_port_setting = SettingsParameters.GrpcPort
port = args.port
if config is not None and grpc_port_setting in config:
port = config.get(grpc_port_setting)

tls_certificates = None
scheme = "grpc+tcp"
if args.tls:
scheme = "grpc+tls"
tls_certificates = _get_tls_certificates(args)

port = config.get(SettingsParameters.GrpcPort)
location = "{}://{}:{}".format(scheme, args.host, port)

server = FlightServer(args.host, location,
Expand Down

0 comments on commit 96e529b

Please sign in to comment.