Skip to content

Default read ZK servers from cfg file #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexbb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Default read ZK servers from cfg file #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions zktop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import threading
import sys
import os

IS_PYTHON2 = sys.version_info[0] == 2

Expand All @@ -41,6 +42,7 @@


ZK_DEFAULT_PORT = 2181
ZK_DEFAULT_CONF = "/etc/zookeeper/conf/zoo.cfg"

usage = "usage: %prog [options]"
parser = OptionParser(usage=usage)
Expand All @@ -61,7 +63,7 @@
help="directory in which to place log file, or empty for none")
parser.add_option("-c", "--config",
dest="configfile", default=None,
help="zookeeper configuration file to lookup servers from")
help="zookeeper configuration file to lookup servers from (default: %s)" % ZK_DEFAULT_CONF)
parser.add_option("-t", "--timeout",
dest="timeout", default=None,
help="connection timeout to zookeeper instance")
Expand All @@ -73,6 +75,10 @@
else:
LOG.disable(LOG.CRITICAL)

# Read servers from config if available
if not options.configfile and options.servers == "localhost:%s" % ZK_DEFAULT_PORT and os.access(ZK_DEFAULT_CONF, os.R_OK):
options.configfile = ZK_DEFAULT_CONF

resized_sig = False


Expand Down Expand Up @@ -381,7 +387,7 @@ def read_zk_config(filename):

def get_zk_servers(filename):
if filename:
config = read_zk_config(options.configfile)
config = read_zk_config(filename)
client_port = config['clientPort']
return ','.join("%s:%s" % (v.split(':', 1)[0], client_port) for k, v in config.items() if k.startswith('server.'))
else:
Expand Down