Skip to content

Commit

Permalink
Merge pull request #15 from essentialkaos/develop
Browse files Browse the repository at this point in the history
Version 2.0.1
  • Loading branch information
andyone authored Jul 6, 2017
2 parents cc9114e + 3921213 commit 6372a66
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
5 changes: 4 additions & 1 deletion common/redis-cli-monitor.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

Summary: Tiny Redis client for renamed MONITOR commands
Name: redis-cli-monitor
Version: 2.0.0
Version: 2.0.1
Release: 0%{?dist}
Group: Applications/System
License: EKOL
Expand Down Expand Up @@ -57,6 +57,9 @@ rm -rf %{buildroot}
###############################################################################

%changelog
* Thu Jul 06 2017 Anton Novojilov <[email protected]> - 2.0.1-0
- Fixed bug with handling redis errors

* Sun Jul 02 2017 Anton Novojilov <[email protected]> - 2.0.0-0
- Added colors and timestamp formatting
- Added option for enabling raw output
Expand Down
8 changes: 4 additions & 4 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ Examples

### Build Status

| Repository | Status |
|------------|--------|
| Stable | [![Build Status](https://travis-ci.org/essentialkaos/redis-cli-monitor.svg?branch=master)](https://travis-ci.org/essentialkaos/redis-cli-monitor) |
| Unstable | [![Build Status](https://travis-ci.org/essentialkaos/redis-cli-monitor.svg?branch=develop)](https://travis-ci.org/essentialkaos/redis-cli-monitor) |
| Branch | Status |
|--------|--------|
| `master` | [![Build Status](https://travis-ci.org/essentialkaos/redis-cli-monitor.svg?branch=master)](https://travis-ci.org/essentialkaos/redis-cli-monitor) |
| `develop` | [![Build Status](https://travis-ci.org/essentialkaos/redis-cli-monitor.svg?branch=develop)](https://travis-ci.org/essentialkaos/redis-cli-monitor) |

### License

Expand Down
6 changes: 5 additions & 1 deletion redis-cli-monitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

const (
APP = "Redis CLI Monitor"
VER = "2.0.0"
VER = "2.0.1"
DESC = "Tiny Redis client for renamed MONITOR commands"
)

Expand Down Expand Up @@ -157,6 +157,10 @@ func monitor(cmd string) {
continue
}

if strings.HasPrefix(str, "-ERR ") {
printErrorAndExit("Redis return error message: " + strings.TrimRight(str[1:], "\r\n"))
}

if useRawOutput {
fmt.Printf("%s", str[1:])
} else {
Expand Down

0 comments on commit 6372a66

Please sign in to comment.