From 22b683bccb2afb0fccaa16ea759f1d050846243b Mon Sep 17 00:00:00 2001 From: makki_d Date: Tue, 24 Dec 2013 05:14:47 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BC=95=E6=95=B0=E3=81=A7=E8=A4=87?= =?UTF-8?q?=E6=95=B0=E3=81=AEyml=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=82=92=E6=B8=A1=E3=81=9B=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- greenload/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/greenload/__init__.py b/greenload/__init__.py index 7f2c2f9..17b6f71 100755 --- a/greenload/__init__.py +++ b/greenload/__init__.py @@ -435,7 +435,9 @@ def main(): parser.print_help() return - conf = load_conf(args[0]) + conf = {} + for arg in args: + conf.update(load_conf(arg)) update_conf(conf, opts) loglevel = conf.get("log_level", 3) From 21f7441c6e3de15fc839230ff7e16236306d88d3 Mon Sep 17 00:00:00 2001 From: makki_d Date: Tue, 24 Dec 2013 05:20:11 +0900 Subject: [PATCH 2/2] help message --- greenload/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/greenload/__init__.py b/greenload/__init__.py index 17b6f71..64c673c 100755 --- a/greenload/__init__.py +++ b/greenload/__init__.py @@ -343,7 +343,7 @@ def make_exvars(ex): def make_parser(): - parser = OptionParser(usage="%prog [options] config.yml") + parser = OptionParser(usage="%prog [options] config.yml ...") parser.add_option('-f', '--fork', type='int') parser.add_option('-c', '--max-request', type='int') parser.add_option('-n', '--loop', type='int')