Skip to content

Commit 855983b

Browse files
andyoneandyone
authored
Merge pull request #34 from essentialkaos/develop
Version 3.2.1
2 parents 7123101 + 5d29f3b commit 855983b

File tree

10 files changed

+109
-34
lines changed

10 files changed

+109
-34
lines changed

‎.github/dependabot.yml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
version: 2
2+
3+
updates:
4+
- package-ecosystem: "gomod"
5+
directory: "/"
6+
target-branch: "develop"
7+
schedule:
8+
interval: "daily"
9+
timezone: "Europe/London"
10+
time: "03:00"
11+
labels:
12+
- "PR • MAINTENANCE"
13+
assignees:
14+
- "andyone"
15+
reviewers:
16+
- "andyone"
17+
18+
- package-ecosystem: "github-actions"
19+
directory: "/"
20+
target-branch: "develop"
21+
schedule:
22+
interval: "daily"
23+
timezone: "Europe/London"
24+
time: "04:00"
25+
labels:
26+
- "PR • MAINTENANCE"
27+
assignees:
28+
- "andyone"
29+
reviewers:
30+
- "andyone"

‎.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
strategy:
2121
matrix:
22-
go: [ '1.16.x', '1.17.x' ]
22+
go: [ '1.17.x', '1.18.x' ]
2323

2424
steps:
2525
- name: Set up Go
@@ -35,7 +35,7 @@ jobs:
3535
echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
3636
3737
- name: Checkout
38-
uses: actions/checkout@v2
38+
uses: actions/checkout@v3
3939
with:
4040
path: ${{env.SRC_DIR}}
4141

@@ -55,7 +55,7 @@ jobs:
5555

5656
steps:
5757
- name: Code checkout
58-
uses: actions/checkout@v2
58+
uses: actions/checkout@v3
5959

6060
- name: Login to DockerHub
6161
uses: docker/login-action@v1

‎.github/workflows/codeql.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
pull_request:
77
branches: [master]
88
schedule:
9-
- cron: '0 20 * * 1,3,5'
9+
- cron: '0 17 * * 1,3,5'
1010

1111
jobs:
1212
analyse:
@@ -19,9 +19,6 @@ jobs:
1919
with:
2020
fetch-depth: 2
2121

22-
- run: git checkout HEAD^2
23-
if: ${{ github.event_name == 'pull_request' }}
24-
2522
- name: Initialize CodeQL
2623
uses: github/codeql-action/init@v1
2724
with:

‎Makefile

+16-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
################################################################################
22

3-
# This Makefile generated by GoMakeGen 1.3.0 using next command:
4-
# gomakegen .
3+
# This Makefile generated by GoMakeGen 1.5.1 using next command:
4+
# gomakegen --mod .
55
#
66
# More info: https://kaos.sh/gomakegen
77

88
################################################################################
99

10+
export GO111MODULE=on
11+
1012
.DEFAULT_GOAL := help
11-
.PHONY = fmt vet all clean git-config deps help
13+
.PHONY = fmt vet all clean deps mod-init mod-update mod-vendor help
1214

1315
################################################################################
1416

@@ -23,11 +25,17 @@ install: ## Install all binaries
2325
uninstall: ## Uninstall all binaries
2426
rm -f /usr/bin/redis-latency-monitor
2527

26-
git-config: ## Configure git redirects for stable import path services
27-
git config --global http.https://pkg.re.followRedirects true
28+
deps: mod-update ## Download dependencies
29+
30+
mod-init: ## Initialize new module
31+
go mod init
32+
go mod tidy
33+
34+
mod-update: ## Download modules to local cache
35+
go mod download
2836

29-
deps: git-config ## Download dependencies
30-
go get -d -v pkg.re/essentialkaos/ek.v11
37+
mod-vendor: ## Make vendored copy of dependencies
38+
go mod vendor
3139

3240
fmt: ## Format source code with gofmt
3341
find . -name "*.go" -exec gofmt -s -w {} \;
@@ -43,6 +51,6 @@ help: ## Show this info
4351
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
4452
| awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-23s\033[0m %s\n", $$1, $$2}'
4553
@echo -e ''
46-
@echo -e '\033[90mGenerated by GoMakeGen 1.3.0\033[0m\n'
54+
@echo -e '\033[90mGenerated by GoMakeGen 1.5.1\033[0m\n'
4755

4856
################################################################################

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Tiny Redis client for latency measurement. Utility show `PING` command latency o
2727

2828
#### From source
2929

30-
To build the `redis-latency-monitor` from scratch, make sure you have a working Go 1.16+ workspace (_[instructions](https://golang.org/doc/install)_), then:
30+
To build the `redis-latency-monitor` from scratch, make sure you have a working Go 1.17+ workspace (_[instructions](https://golang.org/doc/install)_), then:
3131

3232
```
3333
go get github.com/essentialkaos/redis-latency-monitor

‎common/redis-latency-monitor.spec

+12-4
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010

1111
Summary: Tiny Redis client for latency measurement
1212
Name: redis-latency-monitor
13-
Version: 3.2.0
13+
Version: 3.2.1
1414
Release: 0%{?dist}
1515
Group: Applications/System
1616
License: Apache License, Version 2.0
17-
URL: https://github.com/essentialkaos/redis-latency-monitor
17+
URL: https://kaos.sh/redis-latency-monitor
1818

1919
Source0: https://source.kaos.st/%{name}/%{name}-%{version}.tar.bz2
2020

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

23-
BuildRequires: golang >= 1.13
23+
BuildRequires: golang >= 1.17
2424

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

@@ -37,7 +37,9 @@ or connection latency in milliseconds (one thousandth of a second).
3737

3838
%build
3939
export GOPATH=$(pwd)
40-
go build src/github.com/essentialkaos/%{name}/%{name}.go
40+
pushd src/github.com/essentialkaos/%{name}
41+
go build -mod vendor -o $GOPATH/%{name} %{name}.go
42+
popd
4143

4244
%install
4345
rm -rf %{buildroot}
@@ -86,6 +88,12 @@ fi
8688
################################################################################
8789

8890
%changelog
91+
* Wed Mar 30 2022 Anton Novojilov <[email protected]> - 3.2.1-0
92+
- Package ek updated to the latest stable version
93+
- Removed pkg.re usage
94+
- Added module info
95+
- Added Dependabot configuration
96+
8997
* Mon Oct 21 2019 Anton Novojilov <[email protected]> - 3.2.0-0
9098
- Improved UI
9199

‎go.mod

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module github.com/essentialkaos/redis-latency-monitor
2+
3+
go 1.17
4+
5+
require github.com/essentialkaos/ek/v12 v12.42.1

‎go.sum

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
2+
github.com/essentialkaos/check v1.2.1 h1:avvyFy/1acUNwfxwuOLsHeCjfXtMygtbu0lVDr3nxFs=
3+
github.com/essentialkaos/check v1.2.1/go.mod h1:PhxzfJWlf5L/skuyhzBLIvjMB5Xu9TIyDIsqpY5MvB8=
4+
github.com/essentialkaos/ek/v12 v12.42.1 h1:h3PPy0XNXUj1IsEid/p9IzaF0o5hZEGOBFh7XZawAyg=
5+
github.com/essentialkaos/ek/v12 v12.42.1/go.mod h1:Cv/tOZshmFg4pMJnBkg4aW/WyYhzzc41qzZIfk5RSi4=
6+
github.com/essentialkaos/go-linenoise/v3 v3.3.5/go.mod h1:g4X3LhT83XT4h7xwrCLclAdMkJvS9qWBQTGNdS6y4vo=
7+
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
8+
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
9+
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
10+
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
11+
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
12+
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
13+
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
14+
github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
15+
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
16+
golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
17+
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
18+
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
19+
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
20+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21+
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs=
22+
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
23+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
24+
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
25+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
26+
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
27+
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=

‎redis-latency-monitor.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package main
22

33
// ////////////////////////////////////////////////////////////////////////////////// //
44
// //
5-
// Copyright (c) 2020 ESSENTIAL KAOS //
5+
// Copyright (c) 2022 ESSENTIAL KAOS //
66
// Apache License, Version 2.0 <https://www.apache.org/licenses/LICENSE-2.0> //
77
// //
88
// ////////////////////////////////////////////////////////////////////////////////// //
@@ -17,17 +17,17 @@ import (
1717
"strings"
1818
"time"
1919

20-
"pkg.re/essentialkaos/ek.v11/fmtc"
21-
"pkg.re/essentialkaos/ek.v11/fmtutil"
22-
"pkg.re/essentialkaos/ek.v11/fmtutil/table"
23-
"pkg.re/essentialkaos/ek.v11/log"
24-
"pkg.re/essentialkaos/ek.v11/mathutil"
25-
"pkg.re/essentialkaos/ek.v11/options"
26-
"pkg.re/essentialkaos/ek.v11/timeutil"
27-
"pkg.re/essentialkaos/ek.v11/usage"
28-
"pkg.re/essentialkaos/ek.v11/usage/completion/bash"
29-
"pkg.re/essentialkaos/ek.v11/usage/completion/fish"
30-
"pkg.re/essentialkaos/ek.v11/usage/completion/zsh"
20+
"github.com/essentialkaos/ek/v12/fmtc"
21+
"github.com/essentialkaos/ek/v12/fmtutil"
22+
"github.com/essentialkaos/ek/v12/fmtutil/table"
23+
"github.com/essentialkaos/ek/v12/log"
24+
"github.com/essentialkaos/ek/v12/mathutil"
25+
"github.com/essentialkaos/ek/v12/options"
26+
"github.com/essentialkaos/ek/v12/timeutil"
27+
"github.com/essentialkaos/ek/v12/usage"
28+
"github.com/essentialkaos/ek/v12/usage/completion/bash"
29+
"github.com/essentialkaos/ek/v12/usage/completion/fish"
30+
"github.com/essentialkaos/ek/v12/usage/completion/zsh"
3131

3232
"github.com/essentialkaos/redis-latency-monitor/stats"
3333
)
@@ -37,7 +37,7 @@ import (
3737
// App info
3838
const (
3939
APP = "Redis Latency Monitor"
40-
VER = "3.2.0"
40+
VER = "3.2.1"
4141
DESC = "Tiny Redis client for latency measurement"
4242
)
4343

‎stats/stats.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package stats
22

33
// ////////////////////////////////////////////////////////////////////////////////// //
44
// //
5-
// Copyright (c) 2020 ESSENTIAL KAOS //
5+
// Copyright (c) 2022 ESSENTIAL KAOS //
66
// Apache License, Version 2.0 <https://www.apache.org/licenses/LICENSE-2.0> //
77
// //
88
// ////////////////////////////////////////////////////////////////////////////////// //

0 commit comments

Comments
 (0)