vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix bug when no config file exists

Browse source
This commit is contained in:
v3aqb 2013-10-14 20:14:59 +08:00
parent 2f0222aa00
commit ac5901ca20
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
shadowsocks/local.py
View file

@ -178,6 +178,9 @@ def main():
logging.info('loading config from %s' % config_path) logging.info('loading config from %s' % config_path)
with open(config_path, 'rb') as f: with open(config_path, 'rb') as f:
config = json.load(f) config = json.load(f)
else:
config = {}
optlist, args = getopt.getopt(sys.argv[1:], 's:b:p:k:l:m:c:6') optlist, args = getopt.getopt(sys.argv[1:], 's:b:p:k:l:m:c:6')
for key, value in optlist: for key, value in optlist:
if key == '-p': if key == '-p':

2
shadowsocks/server.py
View file

@ -153,6 +153,8 @@ def main():
with open(config_path, 'rb') as f: with open(config_path, 'rb') as f:
config = json.load(f) config = json.load(f)
logging.info('loading config from %s' % config_path) logging.info('loading config from %s' % config_path)
else:
config = {}
optlist, args = getopt.getopt(sys.argv[1:], 's:p:k:m:c:6') optlist, args = getopt.getopt(sys.argv[1:], 's:p:k:m:c:6')
for key, value in optlist: for key, value in optlist: