Skip to content

Commit

Permalink
Merge branch 'release/v0.12.2' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
jelemux authored and cesmarvin committed Oct 24, 2023
2 parents b590d2e + 66b3e53 commit 1427549
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [v0.12.2] - 2023-10-24
### Changed
- [#34] Reduce the wait time on failures while watching the etcd from 5 minutes to 10 seconds.

## [v0.12.1] - 2023-08-23
### Changed
- [#32] Change the log to error, if a dogu `GET` returns a `401` and the cache handles the request error.
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ void potentiallyCreateDoguDocPR() {
stage('Compare dogu docs') {
// ignore stderr output here, diffing non-existing files always leads to a line count of zero
def diffResult = sh(returnStdout: true, script: "diff ${newCoreDoguChapter} ${oldCoreDoguChapter} | wc -l").toString().trim()
if (diffResult > 0) {
if ((diffResult as Integer) > 0) {
shouldCreateDoguDocsPR = true
}
}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Set these to the desired values
ARTIFACT_ID=cesapp-lib
VERSION=0.12.1
VERSION=0.12.2

GOTAG?=1.18.6
MAKEFILES_VERSION=7.4.0
Expand Down
4 changes: 2 additions & 2 deletions registry/resilentetcdclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -282,11 +282,11 @@ func (etcd *resilentEtcdClient) doWatch(ctx context.Context, watcher client.Watc
resp, err := watcher.Next(ctx)
if err != nil {
if strings.Contains(err.Error(), "etcd cluster is unavailable or misconfigured") {
core.GetLogger().Infof("Cannot reach etcd cluster. Try again in 300 seconds. Error: %v", err)
core.GetLogger().Infof("Cannot reach etcd cluster. Try again in 10 seconds. Error: %v", err)
etcd.indexMutex.Lock()
defer etcd.indexMutex.Unlock()
etcd.recentIndex = 0
time.Sleep(time.Minute * 5)
time.Sleep(time.Second * 10)
return
} else {
core.GetLogger().Infof("Could not get event. Try again in 30 seconds. Error: %v", err)
Expand Down

0 comments on commit 1427549

Please sign in to comment.