Skip to content

Commit

Permalink
Merge pull request #16 from maier/master
Browse files Browse the repository at this point in the history
v1.0.0-beta.3
  • Loading branch information
maier authored Jun 24, 2020
2 parents e461850 + b39d09c commit 1daabb5
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 24 deletions.
10 changes: 9 additions & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,15 @@ builds:
-
goarch: 386

ldflags: -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.tag={{.Tag}}
ldflags:
- -s
- -w
- -extldflags "-static"
- -X github.com/circonus-labs/circonus-logwatch/internal/release.VERSION={{.Version}}
- -X github.com/circonus-labs/circonus-logwatch/internal/release.COMMIT={{.ShortCommit}}
- -X github.com/circonus-labs/circonus-logwatch/internal/release.DATE={{.Date}}
- -X github.com/circonus-labs/circonus-logwatch/internal/release.TAG={{.Tag}}


archives:
-
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# v1.0.0-beta.3

* fix: let cgm handle retrying check/agent destinations rather than testing the port
* upd: version information in release package
* upd: skip README.md in `log.d`

# v1.0.0-beta.2

* fix: do not skip config if log file not currently available let tail wait for the log
Expand Down
7 changes: 4 additions & 3 deletions internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,10 @@ func destConf() error {
return errors.Wrapf(err, "destination %s, port %s", dest, addr)
}

if err := testPort("tcp", a.String()); err != nil {
return errors.Wrapf(err, "destination %s, port %s", dest, addr)
}
// let cgm handle retrying agent destination
// if err := testPort("tcp", a.String()); err != nil {
// return errors.Wrapf(err, "destination %s, port %s", dest, addr)
// }

viper.Set(KeyDestAgentURL, fmt.Sprintf("http://%s/write/%s", a.String(), id))

Expand Down
10 changes: 6 additions & 4 deletions internal/configs/configs.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,12 @@ func Load() ([]*Config, error) {
cfgFile := path.Join(logConfDir, entry.Name())
cfgType := filepath.Ext(cfgFile)
if !supportedConfExts.MatchString(cfgType) {
logger.Warn().
Str("type", cfgType).
Str("file", cfgFile).
Msg("unsupported config type, ignoring")
if entry.Name() != "README.md" {
logger.Warn().
Str("type", cfgType).
Str("file", cfgFile).
Msg("unsupported config type, ignoring")
}
continue
}

Expand Down
16 changes: 0 additions & 16 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,8 @@ package main

import (
"github.com/circonus-labs/circonus-logwatch/cmd"
"github.com/circonus-labs/circonus-logwatch/internal/release"
)

func main() {
cmd.Execute()
}

// defined during build (e.g. goreleaser, see .goreleaser.yml)
var (
version = "dev"
commit = "none"
date = "unknown"
tag = ""
)

func init() {
release.VERSION = version
release.COMMIT = commit
release.DATE = date
release.TAG = tag
}

0 comments on commit 1daabb5

Please sign in to comment.