Skip to content

Commit

Permalink
Merge pull request #11 from essentialkaos/develop
Browse files Browse the repository at this point in the history
Version 1.2.2
  • Loading branch information
andyone authored Oct 20, 2018
2 parents ac61d2a + 1f1eef4 commit 9bb63fe
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ sudo: required
language: go

go:
- 1.8.x
- 1.9.x
- 1.10.x
- 1.11.x
- tip
Expand Down
7 changes: 5 additions & 2 deletions common/redis-monitor-top.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

Summary: Tiny Redis client for monitor command output top
Name: redis-monitor-top
Version: 1.2.1
Version: 1.2.2
Release: 0%{?dist}
Group: Applications/System
License: EKOL
Expand All @@ -20,7 +20,7 @@ Source0: https://source.kaos.io/%{name}/%{name}-%{version}.tar.bz2

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: golang >= 1.8
BuildRequires: golang >= 1.11

Provides: %{name} = %{version}-%{release}

Expand Down Expand Up @@ -57,6 +57,9 @@ rm -rf %{buildroot}
################################################################################

%changelog
* Sat Oct 20 2018 Anton Novojilov <[email protected]> - 1.2.2-0
- Show usage info if '-h' passed without any value

* Wed Sep 19 2018 Anton Novojilov <[email protected]> - 1.2.1-0
- Code refactoring

Expand Down
6 changes: 3 additions & 3 deletions redis-monitor-top.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (

const (
APP = "Redis Monitor Top"
VER = "1.2.1"
VER = "1.2.2"
DESC = "Tiny Redis client for aggregating stats from MONITOR flow"
)

Expand Down Expand Up @@ -76,7 +76,7 @@ type Stats struct {

// optMap is map with options
var optMap = options.Map{
OPT_HOST: {Value: "127.0.0.1"},
OPT_HOST: {Type: options.MIXED, Value: "127.0.0.1"},
OPT_PORT: {Value: "6379"},
OPT_TIMEOUT: {Type: options.INT, Value: 3, Min: 1, Max: 300},
OPT_AUTH: {},
Expand Down Expand Up @@ -114,7 +114,7 @@ func main() {
return
}

if options.GetB(OPT_HELP) {
if options.GetB(OPT_HELP) || options.GetS(OPT_HOST) == "true" {
showUsage()
return
}
Expand Down

0 comments on commit 9bb63fe

Please sign in to comment.