[why] compare tool support output result with json | html format, but have no corresponding help message. [how] add the corresponding help message in --theme option [example] compare id=crystal.109482 id=crystal.109483 --theme json
Signed-off-by: Lu Weitao luweitaobe@163.com --- container/srv-http/root/etc/nginx/conf.d/default.conf | 8 ++++---- sbin/compare | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/container/srv-http/root/etc/nginx/conf.d/default.conf b/container/srv-http/root/etc/nginx/conf.d/default.conf index 9c15d99..b5257bc 100644 --- a/container/srv-http/root/etc/nginx/conf.d/default.conf +++ b/container/srv-http/root/etc/nginx/conf.d/default.conf @@ -16,10 +16,10 @@ server { autoindex on; autoindex_localtime on; allow all; - root /srv; - location ~* /[-_a-z]+$ { - add_header Content-Type text/plain; - } +# root /srv; +# location ~* /[-_a-z]+$ { +# add_header Content-Type text/plain; +# } }
location ~* ^/result/(([^/]+)?/?|[^/]+/[^/]+/[^/]+/)$ { diff --git a/sbin/compare b/sbin/compare index b13682e..baa90d4 100755 --- a/sbin/compare +++ b/sbin/compare @@ -12,7 +12,7 @@ # compare "commit=a12d232e" "commit=b3bacc31" # compare "os=debian" "os=centos" -c "suite=iperf" # compare "os=centos" -d "os_version os_arch" -# compare "os=centos" -d "os_version os_arch" --color "classic" +# compare "os=centos" -d "os_version os_arch" --theme "classic"
require 'optparse' require_relative '../lib/compare.rb' @@ -42,9 +42,9 @@ opt_parser = OptionParser.new do |opts| is_group = true end
- opts.on('--color color', 'turn on colorful display with theme: classic|focus_good|focus_bad', - '|striking|light|none') do |color| - colorful = color + opts.on('--theme theme', 'turn on colorful display with theme: classic|focus_good|focus_bad', + '|striking|light|json|html') do |theme| + colorful = theme end
opts.on('-t', '--template template', 'compare with user-defined template') do |t|
On Thu, Nov 12, 2020 at 10:22:50AM +0800, Lu Weitao wrote:
[why] compare tool support output result with json | html format, but have no corresponding help message. [how] add the corresponding help message in --theme option [example] compare id=crystal.109482 id=crystal.109483 --theme json
Signed-off-by: Lu Weitao luweitaobe@163.com
container/srv-http/root/etc/nginx/conf.d/default.conf | 8 ++++---- sbin/compare | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/container/srv-http/root/etc/nginx/conf.d/default.conf b/container/srv-http/root/etc/nginx/conf.d/default.conf index 9c15d99..b5257bc 100644 --- a/container/srv-http/root/etc/nginx/conf.d/default.conf +++ b/container/srv-http/root/etc/nginx/conf.d/default.conf @@ -16,10 +16,10 @@ server { autoindex on; autoindex_localtime on; allow all;
- root /srv;
location ~* /[-_a-z]+$ {
add_header Content-Type text/plain;
}
+# root /srv; +# location ~* /[-_a-z]+$ { +# add_header Content-Type text/plain; +# }
You didn't metion this change in your log. You'd better add something for this change
Thanks, Yuanchao