openstack/oslo.messaging
Code Issues Proposed changes

Merge "[zmq] Add --log-file option to zmq-proxy"

Browse Source
This commit is contained in:
Jenkins 2016-08-30 15:59:02 +00:00 committed by Gerrit Code Review
commit fcf114294b
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
oslo_messaging/_cmd/zmq_proxy.py
View File

@ -42,33 +42,36 @@ def main():
usage=USAGE usage=USAGE
) )
parser.add_argument('--config-file', dest='config_file', type=str, parser.add_argument('-c', '--config-file', dest='config_file', type=str,
help='Path to configuration file') help='Path to configuration file')
parser.add_argument('-l', '--log-file', dest='log_file', type=str,
help='Path to log file')
parser.add_argument('--host', dest='host', type=str, parser.add_argument('-H', '--host', dest='host', type=str,
help='Host FQDN for current proxy') help='Host FQDN for current proxy')
parser.add_argument('--frontend-port', dest='frontend_port', type=int, parser.add_argument('-f', '--frontend-port', dest='frontend_port',
type=int,
help='Front-end ROUTER port number') help='Front-end ROUTER port number')
parser.add_argument('--backend-port', dest='backend_port', type=int, parser.add_argument('-b', '--backend-port', dest='backend_port', type=int,
help='Back-end ROUTER port number') help='Back-end ROUTER port number')
parser.add_argument('--publisher-port', dest='publisher_port', type=int, parser.add_argument('-p', '--publisher-port', dest='publisher_port',
help='Back-end PUBLISHER port number') type=int,
help='Front-end PUBLISHER port number')
parser.add_argument('-d', '--debug', dest='debug', type=bool, parser.add_argument('-d', '--debug', dest='debug', type=bool,
default=False, default=False,
help="Turn on DEBUG logging level instead of INFO") help='Turn on DEBUG logging level instead of INFO')
args = parser.parse_args() args = parser.parse_args()
if args.config_file: if args.config_file:
cfg.CONF(["--config-file", args.config_file]) cfg.CONF(['--config-file', args.config_file])
log_level = logging.INFO log_kwargs = {'level': logging.DEBUG if args.debug else logging.INFO,
if args.debug: 'format': '%(asctime)s %(name)s %(levelname)-8s %(message)s'}
log_level = logging.DEBUG if args.log_file:
logging.basicConfig(level=log_level, log_kwargs.update({'filename': args.log_file})
format='%(asctime)s %(name)s ' logging.basicConfig(**log_kwargs)
'%(levelname)-8s %(message)s')
if args.host: if args.host:
CONF.zmq_proxy_opts.host = args.host CONF.zmq_proxy_opts.host = args.host