Skip to content

Commit

Permalink
Merge pull request #18 from essentialkaos/develop
Browse files Browse the repository at this point in the history
Version 1.4.3
  • Loading branch information
andyone authored Oct 20, 2023
2 parents e7db04f + e32074b commit 78a496e
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 12 deletions.
13 changes: 9 additions & 4 deletions cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import (

const (
APP = "RDS"
VER = "1.4.2"
VER = "1.4.3"
DESC = "Tool for Redis orchestration"
)

Expand Down Expand Up @@ -599,12 +599,17 @@ func runCommand(args options.Arguments) {
cr := commands[cmd]

if isMaintenanceLockSet() {
fmtc.NewLine()
panel.Warn(
"Node in maintenance mode",
`This RDS node currently in maintenance mode. Superuser password is required for {*}ANY{!} command.`,
panel.WRAP,
`This RDS node is currently in maintenance mode. The superuser password is required
for {*_}ANY{!} command.
{s}Maintenance mode is used as a protection when devops/sysadmins perform some dangerous{!}
{s}actions like Redis update or node reconfiguration. Please be patient, it usually{!}
{s}doesn't take long.{!}`,
panel.BOTTOM_LINE,
)
fmtc.Println()
}

executeCommandRoutine(cr, args.Strings()[1:])
Expand Down
2 changes: 1 addition & 1 deletion cli/command_help.go
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ func helpCommandList() {
fmtc.Printf(" {b}%-13s{!} %s\n", "syncing", "Syncing instances")
fmtc.Printf(" {b}%-13s{!} %s\n", "saving", "Saving instances")
fmtc.Printf(" {b}%-13s{!} %s\n", "loading", "Loading instances")
fmtc.Printf(" {b}%-13s{!} %s\n", "abandoned", "Instances with no traffic for a long time")
fmtc.Printf(" {b}%-13s{!} %s\n", "abandoned", "Instances with no traffic for a long time (≥ week)")
fmtc.Printf(" {b}%-13s{!} %s\n", "master-up", "Instances with working syncing")
fmtc.Printf(" {b}%-13s{!} %s\n", "master-down", "Instances with broken syncing")
fmtc.Printf(" {b}%-13s{!} %s\n", "no-replica", "Instances with no replicas")
Expand Down
3 changes: 0 additions & 3 deletions common/rds.knf
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@

[main]

# Maintenance mode flag (superuser password will be required for ANY command)
maintenance: false

# The maximum number of Redis instances (16-1024)
max-instances: 128

Expand Down
6 changes: 5 additions & 1 deletion common/rds.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

Summary: Redis orchestration tool
Name: rds
Version: 1.4.2
Version: 1.4.3
Release: 0%{?dist}
Group: Applications/System
License: Apache License, Version 2.0
Expand Down Expand Up @@ -182,6 +182,10 @@ systemctl daemon-reload &>/dev/null || :
################################################################################

%changelog
* Tue Oct 17 2023 Anton Novojilov <[email protected]> - 1.4.3-0
- [cli] Fixed maintenance mode notification position
- Removed outdated option from configuration file

* Tue Oct 17 2023 Anton Novojilov <[email protected]> - 1.4.2-0
- [cli] Improved support info output
- [cli] Improved full-text search results highlighting
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.20

require (
github.com/essentialkaos/depsy v1.1.0
github.com/essentialkaos/ek/v12 v12.82.0
github.com/essentialkaos/ek/v12 v12.83.0
github.com/essentialkaos/go-linenoise/v3 v3.4.0
github.com/essentialkaos/redy/v4 v4.4.0
)
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk=
github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI=
github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8=
github.com/essentialkaos/ek/v12 v12.82.0 h1:8JqG7E1RWhMJq2CuSV0oaR96pmEjngLPG3cnJ++EJeQ=
github.com/essentialkaos/ek/v12 v12.82.0/go.mod h1:X0gkyjBCP4QiD+sV4D52aquLDLGUmHteMEL7Rsgbev0=
github.com/essentialkaos/ek/v12 v12.83.0 h1:v6hLy+ePx8eRT3U7T9LzoQag3hMMhH2JbV/CgniDrh8=
github.com/essentialkaos/ek/v12 v12.83.0/go.mod h1:X0gkyjBCP4QiD+sV4D52aquLDLGUmHteMEL7Rsgbev0=
github.com/essentialkaos/go-linenoise/v3 v3.4.0 h1:g72w8x+/HIwOMBVvNaPYp+wMWVHrYZwzFAF7OfZR5Ts=
github.com/essentialkaos/go-linenoise/v3 v3.4.0/go.mod h1:t1kNLY2bSMQCy1JXOefD2BDLs/TTPMtTv3DFNV5uDSI=
github.com/essentialkaos/redy/v4 v4.4.0 h1:6r6AkZiDkFWPqnvl0M+u7mcaaWQaeeiZOoLqLAMcnzQ=
Expand Down

0 comments on commit 78a496e

Please sign in to comment.